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/java/jni/native_handle_impl.cc

diff --git a/webrtc/api/java/jni/native_handle_impl.cc b/webrtc/api/java/jni/native_handle_impl.cc
index d52584a..1990828 100644
--- a/webrtc/api/java/jni/native_handle_impl.cc
+++ b/webrtc/api/java/jni/native_handle_impl.cc
@@ -10,12 +10,13 @@
 
 #include "webrtc/api/java/jni/native_handle_impl.h"
 
+#include <memory>
+
 #include "webrtc/api/java/jni/jni_helpers.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/keep_ref_until_done.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 
 using webrtc::NativeHandleBuffer;
@@ -104,7 +105,7 @@
   //
   // TODO(nisse): Use an I420BufferPool. We then need to extend that
   // class, and I420Buffer, to support our memory layout.
-  rtc::scoped_ptr<uint8_t, webrtc::AlignedFreeDeleter> yuv_data(
+  std::unique_ptr<uint8_t, webrtc::AlignedFreeDeleter> yuv_data(
       static_cast<uint8_t*>(webrtc::AlignedMalloc(size, kBufferAlignment)));
   // See SurfaceTextureHelper.java for the required layout.
   uint8_t* y_data = yuv_data.get();