[Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead.

components/sync/driver/startup_controller_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/sync/driver/startup_controller.h"
 
 #include <memory>
 
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 // These are coupled to the implementation of StartupController's
 // GetBackendInitializationStateString which is used by about:sync. We use it
 // as a convenient way to verify internal state and that the class is
 // outputting the correct values for the debug string.
 static const char kStateStringStarted[] = "Started";
 static const char kStateStringDeferred[] = "Deferred";
 static const char kStateStringNotStarted[] = "Not started";
 
 class StartupControllerTest : public testing::Test {
  public:
   StartupControllerTest() : can_start_(false), started_(false) {}
 
   void SetUp() override {
     SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
-    sync_prefs_.reset(new SyncPrefs(&pref_service_));
-    controller_.reset(new StartupController(
+    sync_prefs_ = base::MakeUnique<SyncPrefs>(&pref_service_);
+    controller_ = base::MakeUnique<StartupController>(
         sync_prefs_.get(),
         base::Bind(&StartupControllerTest::CanStart, base::Unretained(this)),
         base::Bind(&StartupControllerTest::FakeStartBackend,
-                   base::Unretained(this))));
+                   base::Unretained(this)));
     controller_->Reset(UserTypes());
     controller_->OverrideFallbackTimeoutForTest(
         base::TimeDelta::FromSeconds(0));
   }
 
   bool CanStart() { return can_start_; }
 
   void SetCanStart(bool can_start) { can_start_ = can_start; }
 
   void FakeStartBackend() {
@@ skipping 154 matching lines @@
   controller()->SetSetupInProgress(true);
 
   // This could happen if the UI triggers a stop-syncing permanently call.
   controller()->Reset(UserTypes());
 
   // From the UI's point of view, setup is still in progress.
   EXPECT_TRUE(controller()->IsSetupInProgress());
 }
 
 }  // namespace syncer