diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 20:09:13 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 20:09:13 +0000 |
| commit | 5e61afb935ec49bda9c3a1ef33fc11eaae242beb (patch) | |
| tree | 8f6ce2ee74bffaaf7680fceb6b65fdf9c6c11f2f /chrome/browser/profiles/profile_manager.cc | |
| parent | b7df4e2be5517bc7914152609e957b77dbcfb26f (diff) | |
| download | chromium_src-5e61afb935ec49bda9c3a1ef33fc11eaae242beb.zip chromium_src-5e61afb935ec49bda9c3a1ef33fc11eaae242beb.tar.gz chromium_src-5e61afb935ec49bda9c3a1ef33fc11eaae242beb.tar.bz2 | |
Remove a bunch of GetProfileSyncService callers to use the new factory.
This is mostly everything except code under /sync or sync_internals (those require a little more time
as they have unit test implications). The ones here are quite simple but need several owner-approvals, and given the upcoming 18 branch I'd like
to get this landed without a cross-team monday crunch :)
TBR=jhawkins@chromium.org
TBR=mirandac@chromium.org
TBR=isherman@chromium.org
TBR=nkostylev@chromium.org
TBR=estade@chromium.org
BUG=93922
Review URL: http://codereview.chromium.org/9169096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_manager.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_manager.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index a608514..9510fb3 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -24,6 +24,7 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" @@ -828,8 +829,11 @@ void ProfileManager::ScheduleProfileForDeletion(const FilePath& profile_dir) { BrowserList::CloseAllBrowsersWithProfile(profile); // Disable sync for doomed profile. - if (profile->HasProfileSyncService()) - profile->GetProfileSyncService()->DisableForUser(); + if (ProfileSyncServiceFactory::GetInstance()->HasProfileSyncService( + profile)) { + ProfileSyncServiceFactory::GetInstance()->GetForProfile( + profile)->DisableForUser(); + } } QueueProfileDirectoryForDeletion(profile_dir); |