Convert //android_webview to use std::unique_ptr

android_webview/native/aw_web_contents_delegate.cc

 // 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.
 
 #include "android_webview/native/aw_web_contents_delegate.h"
 
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/native/aw_contents.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/permission/media_access_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/media_stream_request.h"
@@ skipping 114 matching lines @@
         java_delegate.obj(), is_dialog, user_gesture);
   }
 
   if (create_popup) {
     // The embedder would like to display the popup and we will receive
     // a callback from them later with an AwContents to use to display
     // it. The source AwContents takes ownership of the new WebContents
     // until then, and when the callback is made we will swap the WebContents
     // out into the new AwContents.
     AwContents::FromWebContents(source)->SetPendingWebContentsForPopup(
-        make_scoped_ptr(new_contents));
+        base::WrapUnique(new_contents));
     // Hide the WebContents for the pop up now, we will show it again
     // when the user calls us back with an AwContents to use to show it.
     new_contents->WasHidden();
   } else {
     // The embedder has forgone their chance to display this popup
     // window, so we're done with the WebContents now. We use
     // DeleteSoon as WebContentsImpl may call methods on |new_contents|
     // after this method returns.
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, new_contents);
   }
@@ skipping 64 matching lines @@
 }
 
 void AwWebContentsDelegate::RequestMediaAccessPermission(
     WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   AwContents* aw_contents = AwContents::FromWebContents(web_contents);
   if (!aw_contents) {
     callback.Run(content::MediaStreamDevices(),
                  content::MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN,
-                 scoped_ptr<content::MediaStreamUI>());
+                 std::unique_ptr<content::MediaStreamUI>());
     return;
   }
   aw_contents->GetPermissionRequestHandler()->SendRequest(
-      scoped_ptr<AwPermissionRequestDelegate>(
+      std::unique_ptr<AwPermissionRequestDelegate>(
           new MediaAccessPermissionRequest(request, callback)));
 }
 
 void AwWebContentsDelegate::EnterFullscreenModeForTab(
     content::WebContents* web_contents, const GURL& origin) {
   WebContentsDelegateAndroid::EnterFullscreenModeForTab(web_contents, origin);
   is_fullscreen_ = true;
   web_contents->GetRenderViewHost()->GetWidget()->WasResized();
 }
 
@@ skipping 57 matching lines @@
   DVLOG(0) << "File Chooser result: mode = " << mode
            << ", file paths = " << base::JoinString(file_path_str, ":");
   rvh->FilesSelectedInChooser(files, mode);
 }
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview