Switch SupportsUserData uses to use unique_ptr.

android_webview/native/aw_contents.cc

 // Copyright 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_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 192 matching lines @@
           BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)),
       web_contents_(std::move(web_contents)),
       renderer_manager_key_(GLViewRendererManager::GetInstance()->NullKey()),
       renderer_requested_priority_(
           AwRendererPriorityManager::RENDERER_PRIORITY_HIGH),
       renderer_priority_waived_when_not_visible_(false) {
   base::subtle::NoBarrier_AtomicIncrement(&g_instance_count, 1);
   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;
   if (web_contents_->GetRenderProcessHost() &&
       web_contents_->GetRenderViewHost()) {
     compositor_id.process_id = web_contents_->GetRenderProcessHost()->GetID();
     compositor_id.routing_id =
         web_contents_->GetRenderViewHost()->GetRoutingID();
   }
 
@@ skipping 1008 matching lines @@
 
 void AwContents::UpdateRendererPriority() {
   UpdateRendererPriority(GetComputedRendererPriority());
 }
 
 AwRendererPriorityManager* AwContents::GetAwRendererPriorityManager() {
   content::RenderProcessHost* rph = web_contents_->GetRenderProcessHost();
   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;
 }
 
 AwRendererPriorityManager::RendererPriority
 AwContents::GetCurrentRendererPriority() {
   return GetAwRendererPriorityManager()->GetRendererPriority();
 }
 
 jint AwContents::GetRendererCurrentPriority(
@@ skipping 195 matching lines @@
 
   return Java_AwContents_onRenderProcessGoneDetail(env, obj,
       child_process_id, crashed);
 }
 
 void AwContents::RenderProcessReady(content::RenderProcessHost* host) {
   UpdateRendererPriority();
 }
 
 }  // namespace android_webview