diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 10:10:34 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 10:10:34 +0000 |
| commit | 540380fc6861d7f0e94fb4980df2e0064efeb066 (patch) | |
| tree | 7c41d8bb5220f30b37b2a45a507ab568677fec58 /chrome/browser/password_manager | |
| parent | ded324964bde9c4b1ad4f7dae8048d4e67b97f5a (diff) | |
| download | chromium_src-540380fc6861d7f0e94fb4980df2e0064efeb066.zip chromium_src-540380fc6861d7f0e94fb4980df2e0064efeb066.tar.gz chromium_src-540380fc6861d7f0e94fb4980df2e0064efeb066.tar.bz2 | |
Move clients of BrowserContextKeyedService to use KeyedService (#4)
This change covers:
- //components
- Roughly half of the remaining clients in //chrome
BUG=351704
TBR=jochen
Review URL: https://codereview.chromium.org/198193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/password_manager')
8 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/password_manager/mock_password_store_service.cc b/chrome/browser/password_manager/mock_password_store_service.cc index 3487aaf..64d8da5 100644 --- a/chrome/browser/password_manager/mock_password_store_service.cc +++ b/chrome/browser/password_manager/mock_password_store_service.cc @@ -7,7 +7,7 @@ #include "components/password_manager/core/browser/mock_password_store.h" // static -BrowserContextKeyedService* MockPasswordStoreService::Build( +KeyedService* MockPasswordStoreService::Build( content::BrowserContext* /*profile*/) { scoped_refptr<PasswordStore> store(new MockPasswordStore); if (!store || !store->Init(syncer::SyncableService::StartSyncFlare())) diff --git a/chrome/browser/password_manager/mock_password_store_service.h b/chrome/browser/password_manager/mock_password_store_service.h index 3e4d37c..1552b42a 100644 --- a/chrome/browser/password_manager/mock_password_store_service.h +++ b/chrome/browser/password_manager/mock_password_store_service.h @@ -15,7 +15,7 @@ class BrowserContext; class MockPasswordStoreService : public PasswordStoreService { public: - static BrowserContextKeyedService* Build(content::BrowserContext* profile); + static KeyedService* Build(content::BrowserContext* profile); private: explicit MockPasswordStoreService( diff --git a/chrome/browser/password_manager/null_password_store_service.cc b/chrome/browser/password_manager/null_password_store_service.cc index 6b6c282..219a8bd 100644 --- a/chrome/browser/password_manager/null_password_store_service.cc +++ b/chrome/browser/password_manager/null_password_store_service.cc @@ -7,7 +7,7 @@ #include "components/password_manager/core/browser/password_store.h" // static -BrowserContextKeyedService* NullPasswordStoreService::Build( +KeyedService* NullPasswordStoreService::Build( content::BrowserContext* /*profile*/) { return new NullPasswordStoreService(); } diff --git a/chrome/browser/password_manager/null_password_store_service.h b/chrome/browser/password_manager/null_password_store_service.h index f46e406..cbb1803 100644 --- a/chrome/browser/password_manager/null_password_store_service.h +++ b/chrome/browser/password_manager/null_password_store_service.h @@ -15,7 +15,7 @@ class BrowserContext; class NullPasswordStoreService : public PasswordStoreService { public: - static BrowserContextKeyedService* Build(content::BrowserContext* profile); + static KeyedService* Build(content::BrowserContext* profile); private: NullPasswordStoreService(); diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index 12d157f..f57b300 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc @@ -13,8 +13,8 @@ #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/encryptor/encryptor_switches.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/password_manager/core/browser/login_database.h" #include "components/password_manager/core/browser/password_store.h" #include "components/password_manager/core/browser/password_store_default.h" @@ -116,7 +116,7 @@ LocalProfileId PasswordStoreFactory::GetLocalProfileId( } #endif -BrowserContextKeyedService* PasswordStoreFactory::BuildServiceInstanceFor( +KeyedService* PasswordStoreFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); diff --git a/chrome/browser/password_manager/password_store_factory.h b/chrome/browser/password_manager/password_store_factory.h index ba5d2897..ae26a0e 100644 --- a/chrome/browser/password_manager/password_store_factory.h +++ b/chrome/browser/password_manager/password_store_factory.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/singleton.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" class PasswordStore; class Profile; @@ -22,7 +22,7 @@ typedef int LocalProfileId; #endif // A wrapper of PasswordStore so we can use it as a profiled keyed service. -class PasswordStoreService : public BrowserContextKeyedService { +class PasswordStoreService : public KeyedService { public: // |password_store| needs to be not-NULL, and the constructor expects that // Init() was already called successfully on it. @@ -31,7 +31,7 @@ class PasswordStoreService : public BrowserContextKeyedService { scoped_refptr<PasswordStore> GetPasswordStore(); - // BrowserContextKeyedService implementation. + // KeyedService implementation. virtual void Shutdown() OVERRIDE; private: @@ -59,7 +59,7 @@ class PasswordStoreFactory : public BrowserContextKeyedServiceFactory { #endif // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual void RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) OVERRIDE; diff --git a/chrome/browser/password_manager/test_password_store_service.cc b/chrome/browser/password_manager/test_password_store_service.cc index 64787a9..29829cf 100644 --- a/chrome/browser/password_manager/test_password_store_service.cc +++ b/chrome/browser/password_manager/test_password_store_service.cc @@ -7,7 +7,7 @@ #include "components/password_manager/core/browser/test_password_store.h" // static -BrowserContextKeyedService* TestPasswordStoreService::Build( +KeyedService* TestPasswordStoreService::Build( content::BrowserContext* /*profile*/) { scoped_refptr<PasswordStore> store(new TestPasswordStore); if (!store || !store->Init(syncer::SyncableService::StartSyncFlare())) diff --git a/chrome/browser/password_manager/test_password_store_service.h b/chrome/browser/password_manager/test_password_store_service.h index d4549bf..fae7f3a 100644 --- a/chrome/browser/password_manager/test_password_store_service.h +++ b/chrome/browser/password_manager/test_password_store_service.h @@ -15,7 +15,7 @@ class BrowserContext; class TestPasswordStoreService : public PasswordStoreService { public: - static BrowserContextKeyedService* Build(content::BrowserContext* profile); + static KeyedService* Build(content::BrowserContext* profile); private: explicit TestPasswordStoreService( |