Replace scoped_ptr with unique_ptr in webrtc/api/

webrtc/api/java/jni/native_handle_impl.cc

 /*
  *  Copyright 2015 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.
  */
 
 #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;
 
 namespace {
 
 void RotateMatrix(float a[16], webrtc::VideoRotation rotation) {
   // Texture coordinates are in the range 0 to 1. The transformation of the last
   // row in each rotation matrix is needed for proper translation, e.g, to
   // mirror x, we don't replace x by -x, but by 1-x.
@@ skipping 68 matching lines @@
 AndroidTextureBuffer::NativeToI420Buffer() {
   int uv_width = (width()+7) / 8;
   int stride = 8 * uv_width;
   int uv_height = (height()+1)/2;
   size_t size = stride * (height() + uv_height);
   // The data is owned by the frame, and the normal case is that the
   // data is deleted by the frame's destructor callback.
   //
   // 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();
   uint8_t* u_data = y_data + height() * stride;
   uint8_t* v_data = u_data + stride/2;
 
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> copy =
     new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
         width(), height(),
         y_data, stride,
@@ skipping 42 matching lines @@
   rtc::scoped_refptr<AndroidTextureBuffer> buffer(
       new rtc::RefCountedObject<AndroidTextureBuffer>(
           rotated_width, rotated_height, native_handle_,
           surface_texture_helper_, rtc::KeepRefUntilDone(this)));
 
   RotateMatrix(buffer->native_handle_.sampling_matrix, rotation);
   return buffer;
 }
 
 }  // namespace webrtc_jni