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

android_webview/browser/net/aw_request_interceptor.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/browser/net/aw_request_interceptor.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/input_stream.h"
@@ skipping 83 matching lines @@
         base::Bind(&ShouldInterceptRequestAdaptor::WebResourceResponseObtained,
                    // The lifetime of the DelegateObtainer is managed by
                    // AndroidStreamReaderURLRequestJob, it might get deleted.
                    weak_factory_.GetWeakPtr()));
   }
 
  private:
   void WebResourceResponseObtained(
       std::unique_ptr<AwWebResourceResponse> response) {
     if (response) {
-      callback_.Run(base::WrapUnique(
-          new StreamReaderJobDelegateImpl(std::move(response))));
+      callback_.Run(
+          base::MakeUnique<StreamReaderJobDelegateImpl>(std::move(response)));
     } else {
       callback_.Run(nullptr);
     }
   }
 
   std::unique_ptr<AwContentsIoThreadClient> io_thread_client_;
   Callback callback_;
   base::WeakPtrFactory<ShouldInterceptRequestAdaptor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShouldInterceptRequestAdaptor);
@@ skipping 37 matching lines @@
   GURL referrer(request->referrer());
   if (referrer.is_valid() &&
       (!request->is_pending() || request->is_redirecting())) {
     request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kReferer,
                                          referrer.spec(), true);
   }
   request->SetUserData(kRequestAlreadyHasJobDataKey,
                        new base::SupportsUserData::Data());
   return new AndroidStreamReaderURLRequestJob(
       request, network_delegate,
-      base::WrapUnique(
-          new ShouldInterceptRequestAdaptor(std::move(io_thread_client))),
+      base::MakeUnique<ShouldInterceptRequestAdaptor>(
+          std::move(io_thread_client)),
       true);
 }
 
 }  // namespace android_webview