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

components/search_engines/default_search_policy_handler_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 "components/search_engines/default_search_policy_handler.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
@@ skipping 70 matching lines @@
     "file:///c:/path/to/search?t={searchTerms}";
 const char DefaultSearchPolicyHandlerTest::kHostName[] = "test.com";
 
 void DefaultSearchPolicyHandlerTest::
     BuildDefaultSearchPolicy(PolicyMap* policy) {
   base::ListValue* encodings = new base::ListValue();
   encodings->AppendString("UTF-16");
   encodings->AppendString("UTF-8");
   policy->Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+              base::MakeUnique<base::FundamentalValue>(true), nullptr);
   policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
+              base::MakeUnique<base::StringValue>(kSearchURL), nullptr);
   policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kName)), nullptr);
+              base::MakeUnique<base::StringValue>(kName), nullptr);
   policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kKeyword)), nullptr);
+              base::MakeUnique<base::StringValue>(kKeyword), nullptr);
   policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kSuggestURL)), nullptr);
+              base::MakeUnique<base::StringValue>(kSuggestURL), nullptr);
   policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kIconURL)), nullptr);
+              base::MakeUnique<base::StringValue>(kIconURL), nullptr);
   policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
               base::WrapUnique(encodings), nullptr);
   policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
               default_alternate_urls_.CreateDeepCopy(), nullptr);
   policy->Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
               POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kReplacementKey)),
-              nullptr);
+              base::MakeUnique<base::StringValue>(kReplacementKey), nullptr);
   policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kImageURL)), nullptr);
+              base::MakeUnique<base::StringValue>(kImageURL), nullptr);
   policy->Set(key::kDefaultSearchProviderImageURLPostParams,
               POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kImageParams)), nullptr);
+              base::MakeUnique<base::StringValue>(kImageParams), nullptr);
   policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(new base::StringValue(kNewTabURL)), nullptr);
+              base::MakeUnique<base::StringValue>(kNewTabURL), nullptr);
 }
 
 // Checks that if the default search policy is missing, that no elements of the
 // default search policy will be present.
 TEST_F(DefaultSearchPolicyHandlerTest, MissingUrl) {
   PolicyMap policy;
   BuildDefaultSearchPolicy(&policy);
   policy.Erase(key::kDefaultSearchProviderSearchURL);
   UpdateProviderPolicy(policy);
 
@@ skipping 175 matching lines @@
   temp->GetAsDictionary(&dictionary);
 
   EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kURL, &value));
   EXPECT_EQ(kFileSearchURL, value);
   EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kShortName, &value));
   EXPECT_EQ("_", value);
   EXPECT_TRUE(dictionary->GetString(DefaultSearchManager::kKeyword, &value));
   EXPECT_EQ("_", value);
 }
 }  // namespace policy