commit 623f2f034e1b3d18c6e3d52d3c28ffff1a8a03ca
author Peter Boström <pbos@webrtc.org> Thu Jun 04 13:18:17 2015
committer Peter Boström <pbos@webrtc.org> Thu Jun 04 13:18:28 2015
tree 00e07ba748d48a4e5d23ad029892d5aafb0dc88a
parent 14dd95ebe264b1e4fea32d2e571b4edf93edcc8f

Use one scoped_refptr.

Uses webrtc/base/scoped_ref_ptr.h and removes the copy in
system_wrappers.

BUG=
R=kwiberg@webrtc.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1152733005

Cr-Original-Commit-Position: refs/heads/master@{#9370}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 26b08605e2b99136fcc1cab0800234f469d6e236

video_engine/vie_encoder.h

diff --git a/video_engine/vie_encoder.h b/video_engine/vie_encoder.h
index 43bedb0..26dd810 100644
--- a/video_engine/vie_encoder.h
+++ b/video_engine/vie_encoder.h
@@ -15,16 +15,16 @@
 #include <vector>
 
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
+#include "webrtc/frame_callback.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
 #include "webrtc/modules/video_processing/main/interface/video_processing.h"
 #include "webrtc/typedefs.h"
-#include "webrtc/frame_callback.h"
-#include "webrtc/system_wrappers/interface/scoped_refptr.h"
 #include "webrtc/video_engine/vie_capturer.h"
 #include "webrtc/video_engine/vie_defines.h"
 
@@ -89,7 +89,7 @@
   // Ideally this would be done in Init, but the dependencies between ViEEncoder
   // and ViEChannel makes it really hard to do in a good way.
   void StartThreadsAndSetSharedMembers(
-      scoped_refptr<PayloadRouter> send_payload_router,
+      rtc::scoped_refptr<PayloadRouter> send_payload_router,
       VCMProtectionCallback* vcm_protection_callback);
 
   // This function must be called before the corresponding ViEChannel is
@@ -200,7 +200,7 @@
   const rtc::scoped_ptr<VideoProcessingModule> vpm_;
   const rtc::scoped_ptr<QMVideoSettingsCallback> qm_callback_;
   const rtc::scoped_ptr<VideoCodingModule> vcm_;
-  scoped_refptr<PayloadRouter> send_payload_router_;
+  rtc::scoped_refptr<PayloadRouter> send_payload_router_;
 
   rtc::scoped_ptr<CriticalSectionWrapper> callback_cs_;
   rtc::scoped_ptr<CriticalSectionWrapper> data_cs_;