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

Side by Side Diff: components/sync/driver/fake_sync_client.cc

Issue 2256733004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/sync/driver/fake_sync_client.h" 5 #include "components/sync/driver/fake_sync_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "components/sync/base/extensions_activity.h" 9 #include "components/sync/base/extensions_activity.h"
10 #include "components/sync/driver/fake_sync_service.h" 10 #include "components/sync/driver/fake_sync_service.h"
11 #include "components/sync/driver/sync_prefs.h" 11 #include "components/sync/driver/sync_prefs.h"
12 12
13 namespace sync_driver { 13 namespace sync_driver {
14 14
15 namespace { 15 namespace {
16 16
17 void DummyRegisterPlatformTypesCallback(SyncService* sync_service, 17 void DummyRegisterPlatformTypesCallback(SyncService* sync_service,
18 syncer::ModelTypeSet, 18 syncer::ModelTypeSet,
19 syncer::ModelTypeSet) {} 19 syncer::ModelTypeSet) {}
20 20
21 } // namespace 21 } // namespace
22 22
23 FakeSyncClient::FakeSyncClient() 23 FakeSyncClient::FakeSyncClient()
24 : model_type_service_(nullptr), 24 : model_type_service_(nullptr),
25 factory_(nullptr), 25 factory_(nullptr),
26 sync_service_(base::WrapUnique(new FakeSyncService())) { 26 sync_service_(base::MakeUnique<FakeSyncService>()) {
27 // Register sync preferences and set them to "Sync everything" state. 27 // Register sync preferences and set them to "Sync everything" state.
28 sync_driver::SyncPrefs::RegisterProfilePrefs(pref_service_.registry()); 28 sync_driver::SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
29 sync_driver::SyncPrefs sync_prefs(GetPrefService()); 29 sync_driver::SyncPrefs sync_prefs(GetPrefService());
30 sync_prefs.SetFirstSetupComplete(); 30 sync_prefs.SetFirstSetupComplete();
31 sync_prefs.SetKeepEverythingSynced(true); 31 sync_prefs.SetKeepEverythingSynced(true);
32 } 32 }
33 33
34 FakeSyncClient::FakeSyncClient(SyncApiComponentFactory* factory) 34 FakeSyncClient::FakeSyncClient(SyncApiComponentFactory* factory)
35 : factory_(factory), 35 : factory_(factory), sync_service_(base::MakeUnique<FakeSyncService>()) {
36 sync_service_(base::WrapUnique(new FakeSyncService())) {
37 sync_driver::SyncPrefs::RegisterProfilePrefs(pref_service_.registry()); 36 sync_driver::SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
38 } 37 }
39 38
40 FakeSyncClient::~FakeSyncClient() {} 39 FakeSyncClient::~FakeSyncClient() {}
41 40
42 void FakeSyncClient::Initialize() {} 41 void FakeSyncClient::Initialize() {}
43 42
44 SyncService* FakeSyncClient::GetSyncService() { 43 SyncService* FakeSyncClient::GetSyncService() {
45 return sync_service_.get(); 44 return sync_service_.get();
46 } 45 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 SyncApiComponentFactory* FakeSyncClient::GetSyncApiComponentFactory() { 110 SyncApiComponentFactory* FakeSyncClient::GetSyncApiComponentFactory() {
112 return factory_; 111 return factory_;
113 } 112 }
114 113
115 void FakeSyncClient::SetModelTypeService( 114 void FakeSyncClient::SetModelTypeService(
116 syncer_v2::ModelTypeService* model_type_service) { 115 syncer_v2::ModelTypeService* model_type_service) {
117 model_type_service_ = model_type_service; 116 model_type_service_ = model_type_service;
118 } 117 }
119 118
120 } // namespace sync_driver 119 } // namespace sync_driver
OLDNEW
« no previous file with comments | « components/sync/device_info/device_info_service_unittest.cc ('k') | components/sync/driver/fake_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698