Switch SupportsUserData uses to use unique_ptr.

The interface taking a raw pointer is deprecated and being removed.

BUG=690937

Review-Url: https://codereview.chromium.org/2851673002
Cr-Commit-Position: refs/heads/master@{#468028}

android_webview/browser/aw_contents_client_bridge_base.cc

@@ -4,6 +4,7 @@
 
 #include "android_webview/browser/aw_contents_client_bridge_base.h"
 
+#include "base/memory/ptr_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ -44,7 +45,7 @@ void AwContentsClientBridgeBase::Associate(
     WebContents* web_contents,
     AwContentsClientBridgeBase* handler) {
   web_contents->SetUserData(kAwContentsClientBridgeBase,
-                            new UserData(handler));
+                            base::MakeUnique<UserData>(handler));
 }
 
 // static

android_webview/browser/aw_login_delegate.cc

@@ -7,6 +7,7 @@
 #include "android_webview/browser/aw_browser_context.h"
 #include "base/android/jni_android.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
@@ -52,7 +53,7 @@ AwLoginDelegate::AwLoginDelegate(net::AuthChallengeInfo* auth_info,
 
     if (count == NULL) {
       count = new UrlRequestAuthAttemptsData();
-      request->SetUserData(kAuthAttemptsKey, count);
+      request->SetUserData(kAuthAttemptsKey, base::WrapUnique(count));
     }
 
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,

android_webview/browser/aw_print_manager.cc

@@ -4,6 +4,7 @@
 
 #include "android_webview/browser/aw_print_manager.h"
 
+#include "base/memory/ptr_util.h"
 #include "components/printing/browser/print_manager_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
@@ -20,7 +21,7 @@ AwPrintManager* AwPrintManager::CreateForWebContents(
     const PrintManager::PdfWritingDoneCallback& callback) {
   AwPrintManager* print_manager =
       new AwPrintManager(contents, settings, file_descriptor, callback);
-  contents->SetUserData(UserDataKey(), print_manager);
+  contents->SetUserData(UserDataKey(), base::WrapUnique(print_manager));
   return print_manager;
 }
 

android_webview/browser/browser_view_renderer.cc

@@ -135,8 +135,9 @@ void BrowserViewRenderer::SetCurrentCompositorFrameConsumer(
 
 void BrowserViewRenderer::RegisterWithWebContents(
     content::WebContents* web_contents) {
-  web_contents->SetUserData(kBrowserViewRendererUserDataKey,
-                            new BrowserViewRendererUserData(this));
+  web_contents->SetUserData(
+      kBrowserViewRendererUserDataKey,
+      base::MakeUnique<BrowserViewRendererUserData>(this));
 }
 
 void BrowserViewRenderer::TrimMemory() {

android_webview/browser/net/aw_request_interceptor.cc

@@ -174,7 +174,7 @@ net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest(
                                          referrer.spec(), true);
   }
   request->SetUserData(kRequestAlreadyHasJobDataKey,
-                       new base::SupportsUserData::Data());
+                       base::MakeUnique<base::SupportsUserData::Data>());
   return new AndroidStreamReaderURLRequestJob(
       request, network_delegate,
       base::MakeUnique<ShouldInterceptRequestAdaptor>(

android_webview/native/android_protocol_handler.cc

@@ -41,7 +41,7 @@ void* kPreviouslyFailedKey = &kPreviouslyFailedKey;
 
 void MarkRequestAsFailed(net::URLRequest* request) {
   request->SetUserData(kPreviouslyFailedKey,
-                       new base::SupportsUserData::Data());
+                       base::MakeUnique<base::SupportsUserData::Data>());
 }
 
 bool HasRequestPreviouslyFailed(net::URLRequest* request) {

android_webview/native/aw_contents.cc

@@ -210,7 +210,7 @@ AwContents::AwContents(std::unique_ptr<WebContents> web_contents)
   icon_helper_.reset(new IconHelper(web_contents_.get()));
   icon_helper_->SetListener(this);
   web_contents_->SetUserData(android_webview::kAwContentsUserDataKey,
-                             new AwContentsUserData(this));
+                             base::MakeUnique<AwContentsUserData>(this));
   browser_view_renderer_.RegisterWithWebContents(web_contents_.get());
 
   CompositorID compositor_id;
@@ -1239,8 +1239,9 @@ AwRendererPriorityManager* AwContents::GetAwRendererPriorityManager() {
   AwRendererPriorityManager* manager = static_cast<AwRendererPriorityManager*>(
       rph->GetUserData(kComputedRendererPriorityUserDataKey));
   if (manager == nullptr) {
+    manager = new AwRendererPriorityManager(rph);
     rph->SetUserData(kComputedRendererPriorityUserDataKey,
-                     manager = new AwRendererPriorityManager(rph));
+                     base::WrapUnique(manager));
   }
   return manager;
 }

android_webview/native/aw_settings.cc

@@ -11,6 +11,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -80,7 +81,7 @@ AwSettings::AwSettings(JNIEnv* env,
       renderer_prefs_initialized_(false),
       aw_settings_(env, obj) {
   web_contents->SetUserData(kAwSettingsUserDataKey,
-                            new AwSettingsUserData(this));
+                            base::MakeUnique<AwSettingsUserData>(this));
 }
 
 AwSettings::~AwSettings() {