Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: components/sync_sessions/session_data_type_controller_unittest.cc

Issue 2422253002: [Sync] Rewriting ".reset(new" pattern to use "= base::MakeUnique" instead. (Closed)
Patch Set: Fixing compile. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync_bookmarks/bookmark_data_type_controller_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_sessions/session_data_type_controller_unittest.cc
diff --git a/components/sync_sessions/session_data_type_controller_unittest.cc b/components/sync_sessions/session_data_type_controller_unittest.cc
index 5dc16c41be13054d1b44b45883007783988c58e5..d69704d5ebc541f5faf49dc64e58a2d4c4362c33 100644
--- a/components/sync_sessions/session_data_type_controller_unittest.cc
+++ b/components/sync_sessions/session_data_type_controller_unittest.cc
@@ -9,6 +9,7 @@
#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"
@@ -114,20 +115,20 @@ class SessionDataTypeControllerTest : public testing::Test,
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;
« no previous file with comments | « components/sync_bookmarks/bookmark_data_type_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698