commit d1fe281e12efd938683eae470bf01ce0d5ed3f9d
author kwiberg <kwiberg@webrtc.org> Wed Apr 27 06:47:29 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Apr 27 13:47:40 2016 +0000
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.h

diff --git a/webrtc/api/proxy.h b/webrtc/api/proxy.h
index 663e6c8..2df85c4 100644
--- a/webrtc/api/proxy.h
+++ b/webrtc/api/proxy.h
@@ -47,6 +47,8 @@
 #ifndef WEBRTC_API_PROXY_H_
 #define WEBRTC_API_PROXY_H_
 
+#include <memory>
+
 #include "webrtc/base/event.h"
 #include "webrtc/base/thread.h"
 
@@ -117,7 +119,7 @@
 
  private:
   void OnMessage(rtc::Message*) { proxy_->OnMessage(NULL); e_->Set(); }
-  rtc::scoped_ptr<rtc::Event> e_;
+  std::unique_ptr<rtc::Event> e_;
   rtc::MessageHandler* proxy_;
 };