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

Unified Diff: chrome/browser/sync/sync_setup_wizard_unittest.cc

Issue 9232011: sync: Make ProfileSyncService a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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 | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_setup_wizard_unittest.cc
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index bff5d38bf84da0ccde737e8b5dde31525cb6eaa7..690c50fd77162b8a9d842c4756ae5e5983858372 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -60,10 +60,9 @@ class MockSyncSetupHandler : public OptionsSyncSetupHandler {
// A PSS subtype to inject.
class ProfileSyncServiceForWizardTest : public ProfileSyncService {
public:
- ProfileSyncServiceForWizardTest(ProfileSyncComponentsFactory* factory,
- Profile* profile,
+ ProfileSyncServiceForWizardTest(Profile* profile,
ProfileSyncService::StartBehavior behavior)
- : ProfileSyncService(factory, profile, new SigninManager(), behavior),
+ : ProfileSyncService(NULL, profile, new SigninManager(), behavior),
user_cancelled_dialog_(false),
is_using_secondary_passphrase_(false),
encrypt_everything_(false) {
@@ -177,7 +176,7 @@ class TestingProfileWithSyncService : public TestingProfile {
explicit TestingProfileWithSyncService(
ProfileSyncService::StartBehavior behavior) {
sync_service_.reset(new ProfileSyncServiceForWizardTest(
- &factory_, this, behavior));
+ this, behavior));
}
virtual ProfileSyncService* GetProfileSyncService() {
« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698