Re-write many calls to WrapUnique() with MakeUnique()

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 216 matching lines @@
 
   contents_client_bridge_.reset(
       new AwContentsClientBridge(env, contents_client_bridge));
   AwContentsClientBridgeBase::Associate(web_contents_.get(),
                                         contents_client_bridge_.get());
 
   AwContentsIoThreadClientImpl::Associate(web_contents_.get(),
                                           io_thread_client);
 
   InterceptNavigationDelegate::Associate(
-      web_contents_.get(), base::WrapUnique(new InterceptNavigationDelegate(
-                               env, intercept_navigation_delegate)));
+      web_contents_.get(), base::MakeUnique<InterceptNavigationDelegate>(
+                               env, intercept_navigation_delegate));
 
   // Finally, having setup the associations, release any deferred requests
   for (content::RenderFrameHost* rfh : web_contents_->GetAllFrames()) {
     int render_process_id = rfh->GetProcess()->GetID();
     int render_frame_id = rfh->GetRoutingID();
     AwResourceDispatcherHostDelegate::OnIoThreadClientReady(render_process_id,
                                                             render_frame_id);
   }
 }
 
@@ skipping 1036 matching lines @@
   int routing_id = new_host->GetRoutingID();
   // At this point, the current RVH may or may not contain a compositor. So
   // compositor_ may be nullptr, in which case
   // BrowserViewRenderer::DidInitializeCompositor() callback is time when the
   // new compositor is constructed.
   browser_view_renderer_.SetActiveCompositorID(
       CompositorID(process_id, routing_id));
 }
 
 }  // namespace android_webview