diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 02:35:22 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 02:35:22 +0000 |
| commit | afe1e885fcd2fec54c4d107644c6f574c6817b92 (patch) | |
| tree | e514c39daf208e74b30d8bdaed443f5f46cb4ed2 | |
| parent | 883281c84e20c1d60366438472475b2fff54f76c (diff) | |
| download | chromium_src-afe1e885fcd2fec54c4d107644c6f574c6817b92.zip chromium_src-afe1e885fcd2fec54c4d107644c6f574c6817b92.tar.gz chromium_src-afe1e885fcd2fec54c4d107644c6f574c6817b92.tar.bz2 | |
Revert 118649 - Move SigninManager initialize to factory.
Reverted because it caused a perf regression, as expected.
This is the change I think that introduces the startup perf regression - I'm landing it as a separate patch (split out from the previously r117130) to verify that this indeed caused the regression. If so, I'll revert it.
BUG=108017
TEST=watch perf bots
TBR=tim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9273003
TBR=atwilson@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9270037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118653 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/signin/signin_manager_factory.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/signin/signin_manager_factory.cc b/chrome/browser/signin/signin_manager_factory.cc index 80ef3dd..c32ba9f 100644 --- a/chrome/browser/signin/signin_manager_factory.cc +++ b/chrome/browser/signin/signin_manager_factory.cc @@ -43,6 +43,6 @@ void SigninManagerFactory::RegisterUserPrefs(PrefService* user_prefs) { ProfileKeyedService* SigninManagerFactory::BuildServiceInstanceFor( Profile* profile) const { SigninManager* service = new SigninManager(); - service->Initialize(profile); return service; } + diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index bf4d650..21673d8 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -192,6 +192,8 @@ void ProfileSyncService::Initialize() { if (!HasSyncSetupCompleted()) DisableForUser(); // Clean up in case of previous crash / setup abort. + signin_->Initialize(profile_); + TryStart(); } |