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

chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

 // Copyright (c) 2012 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/chromeos/policy/device_local_account_policy_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 127 matching lines @@
           DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
       cros_settings_(&device_settings_service_),
       extension_cache_task_runner_(new base::TestSimpleTaskRunner) {
 }
 
 void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
   chromeos::DeviceSettingsTestBase::SetUp();
 
   expected_policy_map_.Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
                            POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                           base::WrapUnique(new base::FundamentalValue(true)),
+                           base::MakeUnique<base::FundamentalValue>(true),
                            nullptr);
 
   device_local_account_policy_.payload()
       .mutable_searchsuggestenabled()
       ->set_value(true);
   device_local_account_policy_.policy_data().set_policy_type(
       dm_protocol::kChromePublicAccountPolicyType);
 }
 
 void DeviceLocalAccountPolicyServiceTestBase::TearDown() {
@@ skipping 643 matching lines @@
 
 void DeviceLocalAccountPolicyProviderTest::SetUp() {
   DeviceLocalAccountPolicyServiceTestBase::SetUp();
   provider_->Init(&schema_registry_);
   provider_->AddObserver(&provider_observer_);
 
   // Values implicitly enforced for public accounts.
   expected_policy_map_.Set(
       key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
       POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
-      base::WrapUnique(new base::FundamentalValue(
-          chromeos::PowerPolicyController::ACTION_STOP_SESSION)),
+      base::MakeUnique<base::FundamentalValue>(
+          chromeos::PowerPolicyController::ACTION_STOP_SESSION),
       nullptr);
   expected_policy_map_.Set(
       key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
       POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
-      base::WrapUnique(new base::StringValue("Never")), nullptr);
+      base::MakeUnique<base::StringValue>("Never"), nullptr);
   expected_policy_map_.Set(
       key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY,
       POLICY_SCOPE_MACHINE, POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
-      base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+      base::MakeUnique<base::FundamentalValue>(true), nullptr);
   expected_policy_map_.Set(
       key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
       POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
-      base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+      base::MakeUnique<base::FundamentalValue>(false), nullptr);
 }
 
 void DeviceLocalAccountPolicyProviderTest::TearDown() {
   provider_->RemoveObserver(&provider_observer_);
   provider_->Shutdown();
   provider_.reset();
   DeviceLocalAccountPolicyServiceTestBase::TearDown();
 }
 
 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) {
@@ skipping 44 matching lines @@
       service_->GetBrokerForUser(account_1_user_id_);
   ASSERT_TRUE(broker);
   broker->core()->store()->Load();
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&provider_observer_);
 
   expected_policy_bundle
       .Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
            POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-           base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+           base::MakeUnique<base::FundamentalValue>(false), nullptr);
   EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies()));
 
   // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray|
   // and |ExtensionAllowedTypes| policies should be overridden.
   EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get()))
       .Times(AtLeast(1));
   device_local_account_policy_.payload().mutable_shelfautohidebehavior()->
       set_value("Always");
   device_local_account_policy_.payload().mutable_showlogoutbuttonintray()->
       set_value(false);
@@ skipping 68 matching lines @@
   em::DeviceManagementResponse response;
   device_local_account_policy_.Build();
   response.mutable_policy_response()->add_response()->CopyFrom(
       device_local_account_policy_.policy());
   request_job->SendResponse(DM_STATUS_SUCCESS, response);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&provider_observer_);
 }
 
 }  // namespace policy