Convert //android_webview to use std::unique_ptr

android_webview/native/aw_contents.h

 // Copyright (c) 2012 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.
 
 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
 
 #include <jni.h>
+
 #include <list>
+#include <memory>
 #include <string>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_permission_request_delegate.h"
 #include "android_webview/browser/aw_message_port_message_filter.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/browser_view_renderer_client.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "android_webview/browser/icon_helper.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/browser/shared_renderer_state.h"
 #include "android_webview/browser/shared_renderer_state_client.h"
 #include "android_webview/native/permission/permission_request_handler_client.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback_forward.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 
 class SkBitmap;
 class TabContents;
 struct AwDrawGLInfo;
 
 namespace content {
 class WebContents;
 }
 
 namespace android_webview {
@@ skipping 28 matching lines @@
  public:
   // Returns the AwContents instance associated with |web_contents|, or NULL.
   static AwContents* FromWebContents(content::WebContents* web_contents);
 
   // Returns the AwContents instance associated with with the given
   // render_process_id and render_view_id, or NULL.
   static AwContents* FromID(int render_process_id, int render_view_id);
 
   static std::string GetLocale();
 
-  AwContents(scoped_ptr<content::WebContents> web_contents);
+  AwContents(std::unique_ptr<content::WebContents> web_contents);
   ~AwContents() override;
 
   AwRenderViewHostExt* render_view_host_ext() {
     return render_view_host_ext_.get();
   }
 
   // |handler| is an instance of
   // org.chromium.android_webview.AwHttpAuthHandler.
   bool OnReceivedHttpAuthRequest(const base::android::JavaRef<jobject>& handler,
                                  const std::string& host,
@@ skipping 187 matching lines @@
                          const gfx::SizeF& contents_size_dip,
                          float page_scale_factor,
                          float min_page_scale_factor,
                          float max_page_scale_factor) override;
   void DidOverscroll(const gfx::Vector2d& overscroll_delta,
                      const gfx::Vector2dF& overscroll_velocity) override;
 
   void ClearCache(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& obj,
                   jboolean include_disk_files);
-  void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
+  void SetPendingWebContentsForPopup(
+      std::unique_ptr<content::WebContents> pending);
   jlong ReleasePopupAwContents(JNIEnv* env,
                                const base::android::JavaParamRef<jobject>& obj);
 
   void ScrollTo(JNIEnv* env,
                 const base::android::JavaParamRef<jobject>& obj,
                 jint x,
                 jint y);
   void SmoothScroll(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     jint target_x,
@@ skipping 41 matching lines @@
 
   // Geolocation API support
   void ShowGeolocationPrompt(const GURL& origin, base::Callback<void(bool)>);
   void HideGeolocationPrompt(const GURL& origin);
 
   void SetDipScaleInternal(float dip_scale);
 
   JavaObjectWeakGlobalRef java_ref_;
   SharedRendererState shared_renderer_state_;
   BrowserViewRenderer browser_view_renderer_;  // Must outlive |web_contents_|.
-  scoped_ptr<AwWebContentsDelegate> web_contents_delegate_;
-  scoped_ptr<AwContentsClientBridge> contents_client_bridge_;
-  scoped_ptr<content::WebContents> web_contents_;
-  scoped_ptr<AwRenderViewHostExt> render_view_host_ext_;
-  scoped_ptr<FindHelper> find_helper_;
-  scoped_ptr<IconHelper> icon_helper_;
-  scoped_ptr<AwContents> pending_contents_;
-  scoped_ptr<AwPdfExporter> pdf_exporter_;
-  scoped_ptr<PermissionRequestHandler> permission_request_handler_;
+  std::unique_ptr<AwWebContentsDelegate> web_contents_delegate_;
+  std::unique_ptr<AwContentsClientBridge> contents_client_bridge_;
+  std::unique_ptr<content::WebContents> web_contents_;
+  std::unique_ptr<AwRenderViewHostExt> render_view_host_ext_;
+  std::unique_ptr<FindHelper> find_helper_;
+  std::unique_ptr<IconHelper> icon_helper_;
+  std::unique_ptr<AwContents> pending_contents_;
+  std::unique_ptr<AwPdfExporter> pdf_exporter_;
+  std::unique_ptr<PermissionRequestHandler> permission_request_handler_;
   scoped_refptr<AwMessagePortMessageFilter> message_port_message_filter_;
 
   // GURL is supplied by the content layer as requesting frame.
   // Callback is supplied by the content layer, and is invoked with the result
   // from the permission prompt.
   typedef std::pair<const GURL, base::Callback<void(bool)> > OriginCallback;
   // The first element in the list is always the currently pending request.
   std::list<OriginCallback> pending_geolocation_prompts_;
 
   GLViewRendererManager::Key renderer_manager_key_;
 
   DISALLOW_COPY_AND_ASSIGN(AwContents);
 };
 
 bool RegisterAwContents(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_