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

android_webview/browser/aw_browser_policy_connector.cc

 // Copyright 2015 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/aw_browser_policy_connector.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/policy/core/browser/android/android_combined_policy_provider.h"
@@ skipping 19 matching lines @@
 // Factory for the handlers that will be responsible for converting the policies
 // to the associated preferences.
 std::unique_ptr<policy::ConfigurationPolicyHandlerList> BuildHandlerList(
     const policy::Schema& chrome_schema) {
   std::unique_ptr<policy::ConfigurationPolicyHandlerList> handlers(
       new policy::ConfigurationPolicyHandlerList(
           base::Bind(&PopulatePolicyHandlerParameters),
           base::Bind(&GetChromePolicyDetails)));
 
   // URL Filtering
-  handlers->AddHandler(base::WrapUnique(new policy::SimplePolicyHandler(
+  handlers->AddHandler(base::MakeUnique<policy::SimplePolicyHandler>(
       policy::key::kURLWhitelist, policy::policy_prefs::kUrlWhitelist,
-      base::Value::TYPE_LIST)));
-  handlers->AddHandler(
-      base::WrapUnique(new policy::URLBlacklistPolicyHandler()));
+      base::Value::TYPE_LIST));
+  handlers->AddHandler(base::MakeUnique<policy::URLBlacklistPolicyHandler>());
 
   // HTTP Negotiate authentication
-  handlers->AddHandler(base::WrapUnique(new policy::SimplePolicyHandler(
+  handlers->AddHandler(base::MakeUnique<policy::SimplePolicyHandler>(
       policy::key::kAuthServerWhitelist, prefs::kAuthServerWhitelist,
-      base::Value::TYPE_STRING)));
-  handlers->AddHandler(base::WrapUnique(new policy::SimplePolicyHandler(
+      base::Value::TYPE_STRING));
+  handlers->AddHandler(base::MakeUnique<policy::SimplePolicyHandler>(
       policy::key::kAuthAndroidNegotiateAccountType,
-      prefs::kAuthAndroidNegotiateAccountType, base::Value::TYPE_STRING)));
+      prefs::kAuthAndroidNegotiateAccountType, base::Value::TYPE_STRING));
 
   return handlers;
 }
 
 }  // namespace
 
 AwBrowserPolicyConnector::AwBrowserPolicyConnector()
    : BrowserPolicyConnectorBase(base::Bind(&BuildHandlerList)) {
-  SetPlatformPolicyProvider(base::WrapUnique(
-      new policy::android::AndroidCombinedPolicyProvider(GetSchemaRegistry())));
+  SetPlatformPolicyProvider(
+      base::MakeUnique<policy::android::AndroidCombinedPolicyProvider>(
+          GetSchemaRegistry()));
   InitPolicyProviders();
 }
 
 AwBrowserPolicyConnector::~AwBrowserPolicyConnector() {}
 
 }  // namespace android_webview