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

chrome/browser/download/download_dir_policy_handler_unittest.cc

 // Copyright 2013 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 "chrome/browser/download/download_dir_policy_handler.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 56 matching lines @@
  protected:
   scoped_refptr<policy::ConfigurationPolicyPrefStore> recommended_store_;
 };
 
 #if !defined(OS_CHROMEOS)
 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadDirectory) {
   policy::PolicyMap policy;
   EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(std::string())), nullptr);
+             base::MakeUnique<base::StringValue>(std::string()), nullptr);
   UpdateProviderPolicy(policy);
 
   // Setting a DownloadDirectory should disable the PromptForDownload pref.
   const base::Value* value = NULL;
   EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value));
   ASSERT_TRUE(value);
   bool prompt_for_download = true;
   bool result = value->GetAsBoolean(&prompt_for_download);
   ASSERT_TRUE(result);
   EXPECT_FALSE(prompt_for_download);
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
   EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
 
   policy::PolicyMap policy;
-  policy.Set(
-      policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
-      policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::WrapUnique(new base::StringValue(kDriveNamePolicyVariableName)),
-      nullptr);
+  policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
+             policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::StringValue>(kDriveNamePolicyVariableName),
+             nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* value = NULL;
   bool prompt_for_download;
   EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value));
   EXPECT_TRUE(value);
   EXPECT_TRUE(value->GetAsBoolean(&prompt_for_download));
   EXPECT_FALSE(prompt_for_download);
 
   bool disable_drive;
   EXPECT_TRUE(store_->GetValue(drive::prefs::kDisableDrive, &value));
   EXPECT_TRUE(value);
   EXPECT_TRUE(value->GetAsBoolean(&disable_drive));
   EXPECT_FALSE(disable_drive);
 
   std::string download_directory;
   EXPECT_TRUE(store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
   EXPECT_TRUE(value);
   EXPECT_TRUE(value->GetAsString(&download_directory));
   EXPECT_EQ(GetExpectedDownloadDirectory(), download_directory);
 
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(kUserIDHash)), nullptr);
+             base::MakeUnique<base::StringValue>(kUserIDHash), nullptr);
   UpdateProviderPolicy(policy);
   EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   policy.Set(
       policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::WrapUnique(new base::StringValue(
-          std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot)),
+      base::MakeUnique<base::StringValue>(
+          std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot),
       nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
   EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   EXPECT_TRUE(
       recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
   EXPECT_TRUE(value);
   EXPECT_TRUE(value->GetAsString(&download_directory));
   EXPECT_EQ(GetExpectedDownloadDirectory() + kRelativeToDriveRoot,
             download_directory);
 
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(kUserIDHash)), nullptr);
+             base::MakeUnique<base::StringValue>(kUserIDHash), nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
   EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   EXPECT_TRUE(
       recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
   EXPECT_TRUE(value);
   EXPECT_TRUE(value->GetAsString(&download_directory));
   EXPECT_EQ(kUserIDHash, download_directory);
 }
 #endif