commit b25345ee3f2f27a6814495f7f617f954fb4b192a
author kwiberg <kwiberg@webrtc.org> Sat Mar 12 14:10:44 2016
committer Commit bot <commit-bot@chromium.org> Sat Mar 12 14:10:53 2016
tree 96399d0ee86fa7642a36a80881c85bd6925d1018
parent 83f831a919ff4c2d736ec3c5a33c6afb4d5eea47

Replace scoped_ptr with unique_ptr in webrtc/call/

BUG=webrtc:5520

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

Cr-Commit-Position: refs/heads/master@{#11970}

webrtc/call/bitrate_estimator_tests.cc

diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
index f3bef73..c63d45d 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -9,6 +9,7 @@
  */
 #include <functional>
 #include <list>
+#include <memory>
 #include <string>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ -17,7 +18,6 @@
 #include "webrtc/base/checks.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/call.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
@@ -243,17 +243,17 @@
     VideoSendStream* send_stream_;
     AudioReceiveStream* audio_receive_stream_;
     VideoReceiveStream* video_receive_stream_;
-    rtc::scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_;
+    std::unique_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_;
     test::FakeEncoder fake_encoder_;
     test::FakeDecoder fake_decoder_;
   };
 
   testing::NiceMock<test::MockVoiceEngine> mock_voice_engine_;
   LogObserver receiver_log_;
-  rtc::scoped_ptr<test::DirectTransport> send_transport_;
-  rtc::scoped_ptr<test::DirectTransport> receive_transport_;
-  rtc::scoped_ptr<Call> sender_call_;
-  rtc::scoped_ptr<Call> receiver_call_;
+  std::unique_ptr<test::DirectTransport> send_transport_;
+  std::unique_ptr<test::DirectTransport> receive_transport_;
+  std::unique_ptr<Call> sender_call_;
+  std::unique_ptr<Call> receiver_call_;
   VideoReceiveStream::Config receive_config_;
   std::vector<Stream*> streams_;
 };