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

components/sync_sessions/session_data_type_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_sessions/session_data_type_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/sync/device_info/local_device_info_provider_mock.h"
 #include "components/sync/driver/fake_sync_client.h"
 #include "components/sync/driver/sync_api_component_factory_mock.h"
 #include "components/sync_sessions/fake_sync_sessions_client.h"
@@ skipping 85 matching lines @@
   PrefService* GetPrefService() override { return &prefs_; }
 
   SyncSessionsClient* GetSyncSessionsClient() override {
     return sync_sessions_client_.get();
   }
 
   void SetUp() override {
     prefs_.registry()->RegisterBooleanPref(kSavingBrowserHistoryDisabled,
                                            false);
 
-    synced_window_delegate_.reset(new MockSyncedWindowDelegate());
-    synced_window_getter_.reset(new MockSyncedWindowDelegatesGetter());
-    sync_sessions_client_.reset(new TestSyncSessionsClient());
+    synced_window_delegate_ = base::MakeUnique<MockSyncedWindowDelegate>();
+    synced_window_getter_ = base::MakeUnique<MockSyncedWindowDelegatesGetter>();
+    sync_sessions_client_ = base::MakeUnique<TestSyncSessionsClient>();
     synced_window_getter_->Add(synced_window_delegate_.get());
     sync_sessions_client_->SetSyncedWindowDelegatesGetter(
         synced_window_getter_.get());
 
-    local_device_.reset(new LocalDeviceInfoProviderMock(
+    local_device_ = base::MakeUnique<LocalDeviceInfoProviderMock>(
         "cache_guid", "Wayne Gretzky's Hacking Box", "Chromium 10k",
-        "Chrome 10k", sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id"));
+        "Chrome 10k", sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id");
 
-    controller_.reset(new SessionDataTypeController(
+    controller_ = base::MakeUnique<SessionDataTypeController>(
         base::Bind(&base::DoNothing), this, local_device_.get(),
-        kSavingBrowserHistoryDisabled));
+        kSavingBrowserHistoryDisabled);
 
     load_finished_ = false;
     last_type_ = syncer::UNSPECIFIED;
     last_error_ = syncer::SyncError();
   }
 
   void Start() {
     controller_->LoadModels(
         base::Bind(&SessionDataTypeControllerTest::OnLoadFinished,
                    base::Unretained(this)));
@@ skipping 111 matching lines @@
   EXPECT_EQ(syncer::DataTypeController::MODEL_STARTING, controller()->state());
 
   local_device()->SetInitialized(true);
   EXPECT_EQ(syncer::DataTypeController::MODEL_LOADED, controller()->state());
   EXPECT_TRUE(LoadResult());
 }
 
 }  // namespace
 
 }  // namespace sync_sessions