Convert //android_webview to use std::unique_ptr

android_webview/native/java_browser_view_renderer_helper.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 69 matching lines @@
                         const gfx::Vector2d& scroll_correction,
                         const gfx::Size size);
   ~AuxiliaryCanvasHolder() override;
 
   SkCanvas* GetCanvas() override;
 
  private:
   ScopedJavaLocalRef<jobject> jcanvas_;
   ScopedJavaLocalRef<jobject> jbitmap_;
   gfx::Vector2d scroll_;
-  scoped_ptr<SkBitmap> bitmap_;
+  std::unique_ptr<SkBitmap> bitmap_;
   skia::RefPtr<SkCanvas> canvas_;
   DISALLOW_COPY_AND_ASSIGN(AuxiliaryCanvasHolder);
 };
 
 AuxiliaryCanvasHolder::AuxiliaryCanvasHolder(
     JNIEnv* env,
     jobject java_canvas,
     const gfx::Vector2d& scroll_correction,
     const gfx::Size size)
     : jcanvas_(env, java_canvas), scroll_(scroll_correction) {
@@ skipping 41 matching lines @@
   return canvas_.get();
 }
 
 }  // namespace
 
 void RasterHelperSetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table) {
   g_sw_draw_functions = table;
 }
 
 // static
-scoped_ptr<SoftwareCanvasHolder> SoftwareCanvasHolder::Create(
+std::unique_ptr<SoftwareCanvasHolder> SoftwareCanvasHolder::Create(
     jobject java_canvas,
     const gfx::Vector2d& scroll_correction,
     const gfx::Size& auxiliary_bitmap_size,
     bool force_auxiliary_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  scoped_ptr<SoftwareCanvasHolder> holder;
+  std::unique_ptr<SoftwareCanvasHolder> holder;
   if (!force_auxiliary_bitmap) {
     holder.reset(new JavaCanvasHolder(env, java_canvas, scroll_correction));
   }
   if (!holder.get() || !holder->GetCanvas()) {
     holder.reset();
     holder.reset(new AuxiliaryCanvasHolder(env, java_canvas, scroll_correction,
                                            auxiliary_bitmap_size));
   }
   if (!holder->GetCanvas()) {
     holder.reset();
   }
   return holder;
 }
 
 bool RegisterJavaBrowserViewRendererHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview