diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
| commit | 90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch) | |
| tree | 9c51c7dd97d24b15befa97a3482c51851e5383a1 /chrome/browser/signin/profile_oauth2_token_service_factory.cc | |
| parent | 1515035f5917d10d363b0888a3615d581ad8b83f (diff) | |
| download | chromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz | |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'chrome/browser/signin/profile_oauth2_token_service_factory.cc')
| -rw-r--r-- | chrome/browser/signin/profile_oauth2_token_service_factory.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/signin/profile_oauth2_token_service_factory.cc b/chrome/browser/signin/profile_oauth2_token_service_factory.cc index 8f1723ce66..97687dc2af 100644 --- a/chrome/browser/signin/profile_oauth2_token_service_factory.cc +++ b/chrome/browser/signin/profile_oauth2_token_service_factory.cc @@ -5,18 +5,19 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/token_service_factory.h" +#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #if defined(OS_ANDROID) #include "chrome/browser/signin/android_profile_oauth2_token_service.h" #endif ProfileOAuth2TokenServiceFactory::ProfileOAuth2TokenServiceFactory() - : ProfileKeyedServiceFactory("ProfileOAuth2TokenService", - ProfileDependencyManager::GetInstance()) { + : BrowserContextKeyedServiceFactory( + "ProfileOAuth2TokenService", + BrowserContextDependencyManager::GetInstance()) { DependsOn(SigninManagerFactory::GetInstance()); DependsOn(TokenServiceFactory::GetInstance()); } @@ -28,7 +29,7 @@ ProfileOAuth2TokenServiceFactory::~ProfileOAuth2TokenServiceFactory() { ProfileOAuth2TokenService* ProfileOAuth2TokenServiceFactory::GetForProfile( Profile* profile) { return static_cast<ProfileOAuth2TokenService*>( - GetInstance()->GetServiceForProfile(profile, true)); + GetInstance()->GetServiceForBrowserContext(profile, true)); } // static @@ -37,7 +38,8 @@ ProfileOAuth2TokenServiceFactory* return Singleton<ProfileOAuth2TokenServiceFactory>::get(); } -ProfileKeyedService* ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor( +BrowserContextKeyedService* +ProfileOAuth2TokenServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); ProfileOAuth2TokenService* service; |