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

chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc

 // Copyright (c) 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 "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 18 matching lines @@
     bool create_settings_service) {
   Initialize(create_settings_service);
 }
 
 ScopedCrosSettingsTestHelper::~ScopedCrosSettingsTestHelper() {
   RestoreProvider();
 }
 
 std::unique_ptr<FakeOwnerSettingsService>
 ScopedCrosSettingsTestHelper::CreateOwnerSettingsService(Profile* profile) {
-  return base::WrapUnique(new FakeOwnerSettingsService(
-      profile, new ownership::MockOwnerKeyUtil(), &stub_settings_provider_));
+  return base::MakeUnique<FakeOwnerSettingsService>(
+      profile, new ownership::MockOwnerKeyUtil(), &stub_settings_provider_);
 }
 
 void ScopedCrosSettingsTestHelper::ReplaceProvider(const std::string& path) {
   CHECK(!real_settings_provider_);
   // Swap out the DeviceSettingsProvider with our settings provider so we can
   // set values for the specified path.
   CrosSettings* const cros_settings = CrosSettings::Get();
   real_settings_provider_ = cros_settings->GetProvider(path);
   EXPECT_TRUE(real_settings_provider_);
   EXPECT_TRUE(cros_settings->RemoveSettingsProvider(real_settings_provider_));
@@ skipping 73 matching lines @@
 
 void ScopedCrosSettingsTestHelper::Initialize(bool create_settings_service) {
   if (create_settings_service) {
     CHECK(!DeviceSettingsService::IsInitialized());
     test_device_settings_service_.reset(new ScopedTestDeviceSettingsService());
     test_cros_settings_.reset(new ScopedTestCrosSettings());
   }
 }
 
 }  // namespace chromeos