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

chrome/browser/ui/sync/one_click_signin_sync_starter_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/ui/sync/one_click_signin_sync_starter.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 79 matching lines @@
   // Number of times that the callback is called with SYNC_SETUP_FAILURE.
   int failed_count_;
 
   // Number of times that the callback is called with SYNC_SETUP_SUCCESS.
   int succeeded_count_;
 
  private:
   static std::unique_ptr<KeyedService> BuildSigninManager(
       content::BrowserContext* context) {
     Profile* profile = static_cast<Profile*>(context);
-    return base::WrapUnique(new FakeSigninManager(
+    return base::MakeUnique<FakeSigninManager>(
         ChromeSigninClientFactory::GetForProfile(profile),
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
         AccountTrackerServiceFactory::GetForProfile(profile),
-        GaiaCookieManagerServiceFactory::GetForProfile(profile)));
+        GaiaCookieManagerServiceFactory::GetForProfile(profile));
   }
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninSyncStarterTest);
 };
 
 // Verifies that the callback is invoked when sync setup fails.
 TEST_F(OneClickSigninSyncStarterTest, CallbackSigninFailed) {
   CreateSyncStarter(base::Bind(&OneClickSigninSyncStarterTest::Callback,
                                base::Unretained(this)),
                     GURL());
@@ skipping 26 matching lines @@
 
   const GURL kTestURL = GURL("http://www.example.com");
   CreateSyncStarter(base::Bind(&OneClickSigninSyncStarterTest::Callback,
                                base::Unretained(this)),
                     kTestURL);
   sync_starter_->AccountAddedToCookie(
       GoogleServiceAuthError(GoogleServiceAuthError::NONE));
   EXPECT_EQ(1, succeeded_count_);
   EXPECT_EQ(kTestURL, controller.GetPendingEntry()->GetURL());
 }