Use one scoped_refptr.

webrtc/video_engine/vie_channel.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
 
 #include <list>
 
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/scoped_refptr.h"
 #include "webrtc/system_wrappers/interface/tick_util.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_engine/vie_defines.h"
 #include "webrtc/video_engine/vie_receiver.h"
 #include "webrtc/video_engine/vie_sync_module.h"
 
 namespace webrtc {
 
 class CallStatsObserver;
 class ChannelStatsObserver;
@@ skipping 246 matching lines @@
   int32_t SetMTU(uint16_t mtu);
 
   // Returns maximum allowed payload size, i.e. the maximum allowed size of
   // encoded data in each packet.
   uint16_t MaxDataPayloadLength() const;
   int32_t SetMaxPacketBurstSize(uint16_t max_number_of_packets);
   int32_t SetPacketBurstSpreadState(bool enable, const uint16_t frame_periodMS);
 
   // Gets the modules used by the channel.
   RtpRtcp* rtp_rtcp();
-  scoped_refptr<PayloadRouter> send_payload_router();
+  rtc::scoped_refptr<PayloadRouter> send_payload_router();
   VCMProtectionCallback* vcm_protection_callback();
 
 
   CallStatsObserver* GetStatsObserver();
 
   // Implements VCMReceiveCallback.
   virtual int32_t FrameToRender(VideoFrame& video_frame);  // NOLINT
 
   // Implements VCMReceiveCallback.
   virtual int32_t ReceivedDecodedReferenceFrame(
@@ skipping 169 matching lines @@
   uint8_t num_socket_threads_;
 
   // Used for all registered callbacks except rendering.
   rtc::scoped_ptr<CriticalSectionWrapper> callback_cs_;
   rtc::scoped_ptr<CriticalSectionWrapper> rtp_rtcp_cs_;
 
   // Owned modules/classes.
   rtc::scoped_ptr<RtpRtcp> rtp_rtcp_;
   std::list<RtpRtcp*> simulcast_rtp_rtcp_;
   std::list<RtpRtcp*> removed_rtp_rtcp_;
-  scoped_refptr<PayloadRouter> send_payload_router_;
+  rtc::scoped_refptr<PayloadRouter> send_payload_router_;
   rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_;
 
   VideoCodingModule* const vcm_;
   ViEReceiver vie_receiver_;
   ViESyncModule vie_sync_;
 
   // Helper to report call statistics.
   rtc::scoped_ptr<ChannelStatsObserver> stats_observer_;
 
   // Not owned.
@@ skipping 31 matching lines @@
   int nack_history_size_sender_;
   int max_nack_reordering_threshold_;
   I420FrameCallback* pre_render_callback_;
 
   rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_