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

android_webview/native/aw_contents_client_bridge_unittest.cc

 // Copyright 2014 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_client_bridge.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 89 matching lines @@
     TestCertType(cert_types[i], expected_names[i]);
   }
 }
 
 void AwContentsClientBridgeTest::TestCertType(SSLClientCertType type,
       const std::string& expected_name) {
   cert_request_info_->cert_key_types.clear();
   cert_request_info_->cert_key_types.push_back(type);
   bridge_->SelectClientCertificate(
       cert_request_info_.get(),
-      base::WrapUnique(new TestClientCertificateDelegate(this)));
+      base::MakeUnique<TestClientCertificateDelegate>(this));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, cert_selected_callbacks_);
   ScopedJavaLocalRef<jobjectArray> key_types =
       Java_MockAwContentsClientBridge_getKeyTypes(env_, jbridge_);
   std::vector<std::string> vec;
   base::android::AppendJavaStringArrayToStringVector(env_,
                                                      key_types.obj(),
                                                      &vec);
   EXPECT_EQ(1u, vec.size());
   EXPECT_EQ(expected_name, vec[0]);
@@ skipping 29 matching lines @@
       base::WrapUnique(new TestClientCertificateDelegate(this)));
   int requestId = Java_MockAwContentsClientBridge_getRequestId(env_, jbridge_);
   bridge_->ProvideClientCertificateResponse(env_, jbridge_, requestId, nullptr,
                                             nullptr);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(nullptr, selected_cert_);
   EXPECT_EQ(1, cert_selected_callbacks_);
 }
 
 }   // android_webview