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

android_webview/browser/aw_browser_policy_connector.cc

Index: android_webview/browser/aw_browser_policy_connector.cc
diff --git a/android_webview/browser/aw_browser_policy_connector.cc b/android_webview/browser/aw_browser_policy_connector.cc
index 8d366c59271063467c4597f83c728a80584af4ae..1c0b38c333e746d9f2904d5688915f22179c1236 100644
--- a/android_webview/browser/aw_browser_policy_connector.cc
+++ b/android_webview/browser/aw_browser_policy_connector.cc
@@ -37,19 +37,18 @@ std::unique_ptr<policy::ConfigurationPolicyHandlerList> BuildHandlerList(
           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;
 }
@@ -58,8 +57,9 @@ std::unique_ptr<policy::ConfigurationPolicyHandlerList> BuildHandlerList(
 
 AwBrowserPolicyConnector::AwBrowserPolicyConnector()
    : BrowserPolicyConnectorBase(base::Bind(&BuildHandlerList)) {
-  SetPlatformPolicyProvider(base::WrapUnique(
-      new policy::android::AndroidCombinedPolicyProvider(GetSchemaRegistry())));
+  SetPlatformPolicyProvider(
+      base::MakeUnique<policy::android::AndroidCombinedPolicyProvider>(
+          GetSchemaRegistry()));
   InitPolicyProviders();
 }