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

android_webview/native/android_protocol_handler.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/android_protocol_handler.h"
 
 #include <utility>
 
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
@@ skipping 123 matching lines @@
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jobject> stream =
       android_webview::Java_AndroidProtocolHandler_open(
           env, GetResourceContext(env), jurl);
 
   if (stream.is_null()) {
     DLOG(ERROR) << "Unable to open input stream for Android URL";
     return std::unique_ptr<InputStream>();
   }
-  return base::WrapUnique(new InputStreamImpl(stream));
+  return base::MakeUnique<InputStreamImpl>(stream);
 }
 
 void AndroidStreamReaderURLRequestJobDelegateImpl::OnInputStreamOpenFailed(
     net::URLRequest* request,
     bool* restart) {
   DCHECK(!HasRequestPreviouslyFailed(request));
   MarkRequestAsFailed(request);
   *restart = true;
 }
 
@@ skipping 89 matching lines @@
 
 namespace android_webview {
 
 bool RegisterAndroidProtocolHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 std::unique_ptr<net::URLRequestInterceptor>
 CreateContentSchemeRequestInterceptor() {
-  return base::WrapUnique(new ContentSchemeRequestInterceptor());
+  return base::MakeUnique<ContentSchemeRequestInterceptor>();
 }
 
 // static
 std::unique_ptr<net::URLRequestInterceptor>
 CreateAssetFileRequestInterceptor() {
   return std::unique_ptr<net::URLRequestInterceptor>(
       new AssetFileRequestInterceptor());
 }
 
 // Set a context object to be used for resolving resource queries. This can
@@ skipping 19 matching lines @@
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidAssetPath);
 }
 
 static ScopedJavaLocalRef<jstring> GetAndroidResourcePath(
     JNIEnv* env,
     const JavaParamRef<jclass>& /*clazz*/) {
   return ConvertUTF8ToJavaString(env, android_webview::kAndroidResourcePath);
 }
 
 }  // namespace android_webview