commit d1fe281e12efd938683eae470bf01ce0d5ed3f9d
author kwiberg <kwiberg@webrtc.org> Wed Apr 27 13:47:29 2016
committer Commit bot <commit-bot@chromium.org> Wed Apr 27 13:47:40 2016
tree 91e3c58ee2cf4a0e2814bc15a199064b0de7e9b8
parent 034154b46a716387298a19f07a2e40983d84d78d

Replace scoped_ptr with unique_ptr in webrtc/api/

But keep #including scoped_ptr.h in .h files, so as not to break
WebRTC users who expect those .h files to give them rtc::scoped_ptr.

BUG=webrtc:5520

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

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

webrtc/api/proxy_unittest.cc

diff --git a/webrtc/api/proxy_unittest.cc b/webrtc/api/proxy_unittest.cc
index 557c85b..931ba28 100644
--- a/webrtc/api/proxy_unittest.cc
+++ b/webrtc/api/proxy_unittest.cc
@@ -10,12 +10,12 @@
 
 #include "webrtc/api/proxy.h"
 
+#include <memory>
 #include <string>
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread.h"
 
 using ::testing::_;
@@ -98,7 +98,7 @@
   }
 
  protected:
-  rtc::scoped_ptr<rtc::Thread> signaling_thread_;
+  std::unique_ptr<rtc::Thread> signaling_thread_;
   rtc::scoped_refptr<FakeInterface> fake_signaling_proxy_;
   rtc::scoped_refptr<Fake> fake_;
 };
@@ -175,7 +175,7 @@
   }
 
  protected:
-  rtc::scoped_ptr<rtc::Thread> worker_thread_;
+  std::unique_ptr<rtc::Thread> worker_thread_;
   rtc::scoped_refptr<FakeInterface> fake_proxy_;
 };