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

Side by Side Diff: components/browser_sync/profile_sync_service_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 unified diff | Download patch
OLDNEW
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/profile_sync_service.h" 5 #include "components/browser_sync/profile_sync_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/feature_list.h" 11 #include "base/feature_list.h"
12 #include "base/memory/ptr_util.h"
12 #include "base/run_loop.h" 13 #include "base/run_loop.h"
13 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
16 #include "base/test/scoped_feature_list.h" 17 #include "base/test/scoped_feature_list.h"
17 #include "base/test/sequenced_worker_pool_owner.h" 18 #include "base/test/sequenced_worker_pool_owner.h"
18 #include "base/threading/thread_task_runner_handle.h" 19 #include "base/threading/thread_task_runner_handle.h"
19 #include "base/values.h" 20 #include "base/values.h"
20 #include "components/browser_sync/browser_sync_switches.h" 21 #include "components/browser_sync/browser_sync_switches.h"
21 #include "components/browser_sync/profile_sync_test_util.h" 22 #include "components/browser_sync/profile_sync_test_util.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 230
230 void CreateService(ProfileSyncService::StartBehavior behavior) { 231 void CreateService(ProfileSyncService::StartBehavior behavior) {
231 signin_manager()->SetAuthenticatedAccountInfo(kGaiaId, kEmail); 232 signin_manager()->SetAuthenticatedAccountInfo(kGaiaId, kEmail);
232 component_factory_ = profile_sync_service_bundle_.component_factory(); 233 component_factory_ = profile_sync_service_bundle_.component_factory();
233 ProfileSyncServiceBundle::SyncClientBuilder builder( 234 ProfileSyncServiceBundle::SyncClientBuilder builder(
234 &profile_sync_service_bundle_); 235 &profile_sync_service_bundle_);
235 ProfileSyncService::InitParams init_params = 236 ProfileSyncService::InitParams init_params =
236 profile_sync_service_bundle_.CreateBasicInitParams(behavior, 237 profile_sync_service_bundle_.CreateBasicInitParams(behavior,
237 builder.Build()); 238 builder.Build());
238 239
239 service_.reset(new ProfileSyncService(std::move(init_params))); 240 service_ = base::MakeUnique<ProfileSyncService>(std::move(init_params));
240 service_->RegisterDataTypeController( 241 service_->RegisterDataTypeController(
241 base::MakeUnique<syncer::FakeDataTypeController>(syncer::BOOKMARKS)); 242 base::MakeUnique<syncer::FakeDataTypeController>(syncer::BOOKMARKS));
242 } 243 }
243 244
244 #if defined(OS_WIN) || defined(OS_MACOSX) || \ 245 #if defined(OS_WIN) || defined(OS_MACOSX) || \
245 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) 246 (defined(OS_LINUX) && !defined(OS_CHROMEOS))
246 void CreateServiceWithoutSignIn() { 247 void CreateServiceWithoutSignIn() {
247 CreateService(ProfileSyncService::AUTO_START); 248 CreateService(ProfileSyncService::AUTO_START);
248 signin_manager()->SignOut(signin_metrics::SIGNOUT_TEST, 249 signin_manager()->SignOut(signin_metrics::SIGNOUT_TEST,
249 signin_metrics::SignoutDelete::IGNORE_METRIC); 250 signin_metrics::SignoutDelete::IGNORE_METRIC);
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if 947 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if
947 // entry for sessions exists in map. 948 // entry for sessions exists in map.
948 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) { 949 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) {
949 CreateService(ProfileSyncService::AUTO_START); 950 CreateService(ProfileSyncService::AUTO_START);
950 service()->OnSessionRestoreComplete(); 951 service()->OnSessionRestoreComplete();
951 service()->OnSyncCycleCompleted(); 952 service()->OnSyncCycleCompleted();
952 } 953 }
953 954
954 } // namespace 955 } // namespace
955 } // namespace browser_sync 956 } // namespace browser_sync
OLDNEW
« no previous file with comments | « components/browser_sync/profile_sync_service_startup_unittest.cc ('k') | components/sync/base/cryptographer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698