OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser_sync/browser/profile_sync_service.h" | 5 #include "components/browser_sync/browser/profile_sync_service.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 signin_manager()->SetAuthenticatedAccountInfo(kGaiaId, kEmail); | 242 signin_manager()->SetAuthenticatedAccountInfo(kGaiaId, kEmail); |
243 component_factory_ = profile_sync_service_bundle_.component_factory(); | 243 component_factory_ = profile_sync_service_bundle_.component_factory(); |
244 ProfileSyncServiceBundle::SyncClientBuilder builder( | 244 ProfileSyncServiceBundle::SyncClientBuilder builder( |
245 &profile_sync_service_bundle_); | 245 &profile_sync_service_bundle_); |
246 ProfileSyncService::InitParams init_params = | 246 ProfileSyncService::InitParams init_params = |
247 profile_sync_service_bundle_.CreateBasicInitParams(behavior, | 247 profile_sync_service_bundle_.CreateBasicInitParams(behavior, |
248 builder.Build()); | 248 builder.Build()); |
249 | 249 |
250 service_.reset(new ProfileSyncService(std::move(init_params))); | 250 service_.reset(new ProfileSyncService(std::move(init_params))); |
251 service_->RegisterDataTypeController( | 251 service_->RegisterDataTypeController( |
252 new sync_driver::FakeDataTypeController(syncer::BOOKMARKS)); | 252 base::MakeUnique<sync_driver::FakeDataTypeController>( |
| 253 syncer::BOOKMARKS)); |
253 } | 254 } |
254 | 255 |
255 #if defined(OS_WIN) || defined(OS_MACOSX) || \ | 256 #if defined(OS_WIN) || defined(OS_MACOSX) || \ |
256 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | 257 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
257 void CreateServiceWithoutSignIn() { | 258 void CreateServiceWithoutSignIn() { |
258 CreateService(ProfileSyncService::AUTO_START); | 259 CreateService(ProfileSyncService::AUTO_START); |
259 signin_manager()->SignOut(signin_metrics::SIGNOUT_TEST, | 260 signin_manager()->SignOut(signin_metrics::SIGNOUT_TEST, |
260 signin_metrics::SignoutDelete::IGNORE_METRIC); | 261 signin_metrics::SignoutDelete::IGNORE_METRIC); |
261 } | 262 } |
262 #endif | 263 #endif |
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if | 966 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if |
966 // entry for sessions exists in map. | 967 // entry for sessions exists in map. |
967 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) { | 968 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) { |
968 CreateService(ProfileSyncService::AUTO_START); | 969 CreateService(ProfileSyncService::AUTO_START); |
969 service()->OnSessionRestoreComplete(); | 970 service()->OnSessionRestoreComplete(); |
970 service()->OnSyncCycleCompleted(); | 971 service()->OnSyncCycleCompleted(); |
971 } | 972 } |
972 | 973 |
973 } // namespace | 974 } // namespace |
974 } // namespace browser_sync | 975 } // namespace browser_sync |
OLD | NEW |