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

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

Issue 8596017: sync: rename ProfileSyncFactory to ProfileSyncComponentsFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final Created 9 years, 1 month 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
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 0c3628d183922eb09e6734b00599236f7e57c69e..3514165cbfa6a4451366c3dc4b6e77ca800e82cc 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -9,7 +9,7 @@
#include "base/stl_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/sync/profile_sync_factory_mock.h"
+#include "chrome/browser/sync/profile_sync_components_factory_mock.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/signin_manager.h"
#include "chrome/browser/sync/sync_setup_flow.h"
@@ -58,7 +58,8 @@ class MockSyncSetupHandler : public OptionsSyncSetupHandler {
// A PSS subtype to inject.
class ProfileSyncServiceForWizardTest : public ProfileSyncService {
public:
- ProfileSyncServiceForWizardTest(ProfileSyncFactory* factory, Profile* profile)
+ ProfileSyncServiceForWizardTest(ProfileSyncComponentsFactory* factory,
+ Profile* profile)
: ProfileSyncService(factory, profile, new SigninManager(), ""),
user_cancelled_dialog_(false),
is_using_secondary_passphrase_(false),
@@ -183,7 +184,7 @@ class TestingProfileWithSyncService : public TestingProfile {
return sync_service_.get();
}
private:
- ProfileSyncFactoryMock factory_;
+ ProfileSyncComponentsFactoryMock factory_;
scoped_ptr<ProfileSyncService> sync_service_;
};
« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698