diff options
98 files changed, 230 insertions, 252 deletions
@@ -4,6 +4,7 @@ include_rules = [ "+content/public/common", "+content/public/test", "+components/browser_context_keyed_service", + "+components/keyed_service", "+components/user_prefs/pref_registry_syncable.h", "+components/web_modal", "+extensions", diff --git a/apps/app_lifetime_monitor.h b/apps/app_lifetime_monitor.h index 45ab09a..fe63514 100644 --- a/apps/app_lifetime_monitor.h +++ b/apps/app_lifetime_monitor.h @@ -10,7 +10,7 @@ #include "apps/app_window_registry.h" #include "base/observer_list.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -24,7 +24,7 @@ namespace apps { // Observes startup of apps and their windows and notifies observers of these // events. -class AppLifetimeMonitor : public BrowserContextKeyedService, +class AppLifetimeMonitor : public KeyedService, public content::NotificationObserver, public AppWindowRegistry::Observer { public: @@ -66,7 +66,7 @@ class AppLifetimeMonitor : public BrowserContextKeyedService, virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE; virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE; - // BrowserContextKeyedService overrides: + // KeyedService overrides: virtual void Shutdown() OVERRIDE; void NotifyAppStart(const std::string& app_id); diff --git a/apps/app_lifetime_monitor_factory.cc b/apps/app_lifetime_monitor_factory.cc index b8a813a..e02297d 100644 --- a/apps/app_lifetime_monitor_factory.cc +++ b/apps/app_lifetime_monitor_factory.cc @@ -7,7 +7,7 @@ #include "apps/app_lifetime_monitor.h" #include "apps/app_window_registry.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extensions_browser_client.h" namespace apps { @@ -31,7 +31,7 @@ AppLifetimeMonitorFactory::AppLifetimeMonitorFactory() AppLifetimeMonitorFactory::~AppLifetimeMonitorFactory() {} -BrowserContextKeyedService* AppLifetimeMonitorFactory::BuildServiceInstanceFor( +KeyedService* AppLifetimeMonitorFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new AppLifetimeMonitor(static_cast<Profile*>(profile)); } diff --git a/apps/app_lifetime_monitor_factory.h b/apps/app_lifetime_monitor_factory.h index c55ba71..9732b74 100644 --- a/apps/app_lifetime_monitor_factory.h +++ b/apps/app_lifetime_monitor_factory.h @@ -6,7 +6,7 @@ #define APPS_APP_LIFETIME_MONITOR_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -30,7 +30,7 @@ class AppLifetimeMonitorFactory : public BrowserContextKeyedServiceFactory { virtual ~AppLifetimeMonitorFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( diff --git a/apps/app_load_service.h b/apps/app_load_service.h index 518a30a..ec71a7e 100644 --- a/apps/app_load_service.h +++ b/apps/app_load_service.h @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -24,7 +24,7 @@ namespace apps { // Monitors apps being reloaded and performs app specific actions (like launch // or restart) on them. Also provides an interface to schedule these actions. -class AppLoadService : public BrowserContextKeyedService, +class AppLoadService : public KeyedService, public content::NotificationObserver { public: enum PostReloadActionType { diff --git a/apps/app_load_service_factory.cc b/apps/app_load_service_factory.cc index 771db73..23ffd1e 100644 --- a/apps/app_load_service_factory.cc +++ b/apps/app_load_service_factory.cc @@ -7,7 +7,7 @@ #include "apps/app_load_service.h" #include "apps/app_window_registry.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -37,7 +37,7 @@ AppLoadServiceFactory::AppLoadServiceFactory() AppLoadServiceFactory::~AppLoadServiceFactory() { } -BrowserContextKeyedService* AppLoadServiceFactory::BuildServiceInstanceFor( +KeyedService* AppLoadServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new AppLoadService(static_cast<Profile*>(profile)); } diff --git a/apps/app_load_service_factory.h b/apps/app_load_service_factory.h index 453c4a3..61b2110 100644 --- a/apps/app_load_service_factory.h +++ b/apps/app_load_service_factory.h @@ -6,7 +6,7 @@ #define APPS_APP_LOAD_SERVICE_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -27,7 +27,7 @@ class AppLoadServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~AppLoadServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; diff --git a/apps/app_restore_service.h b/apps/app_restore_service.h index 9dd88cf..33a407a 100644 --- a/apps/app_restore_service.h +++ b/apps/app_restore_service.h @@ -10,7 +10,7 @@ #include "apps/app_lifetime_monitor.h" #include "apps/app_window_registry.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" namespace extensions { class Extension; @@ -21,7 +21,7 @@ class Profile; namespace apps { // Tracks what apps need to be restarted when the browser restarts. -class AppRestoreService : public BrowserContextKeyedService, +class AppRestoreService : public KeyedService, public AppLifetimeMonitor::Observer { public: // Returns true if apps should be restored on the current platform, given @@ -50,7 +50,7 @@ class AppRestoreService : public BrowserContextKeyedService, virtual void OnAppStop(Profile* profile, const std::string& app_id) OVERRIDE; virtual void OnChromeTerminating() OVERRIDE; - // BrowserContextKeyedService. + // KeyedService. virtual void Shutdown() OVERRIDE; void RecordAppStart(const std::string& extension_id); diff --git a/apps/app_restore_service_factory.cc b/apps/app_restore_service_factory.cc index a762e53..10dcd25 100644 --- a/apps/app_restore_service_factory.cc +++ b/apps/app_restore_service_factory.cc @@ -7,7 +7,7 @@ #include "apps/app_lifetime_monitor_factory.h" #include "apps/app_restore_service.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace apps { @@ -31,7 +31,7 @@ AppRestoreServiceFactory::AppRestoreServiceFactory() AppRestoreServiceFactory::~AppRestoreServiceFactory() { } -BrowserContextKeyedService* AppRestoreServiceFactory::BuildServiceInstanceFor( +KeyedService* AppRestoreServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new AppRestoreService(static_cast<Profile*>(profile)); } diff --git a/apps/app_restore_service_factory.h b/apps/app_restore_service_factory.h index 1c0d438..80f8fb0 100644 --- a/apps/app_restore_service_factory.h +++ b/apps/app_restore_service_factory.h @@ -6,7 +6,7 @@ #define APPS_APP_RESTORE_SERVICE_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -30,7 +30,7 @@ class AppRestoreServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~AppRestoreServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; }; diff --git a/apps/app_window_geometry_cache.cc b/apps/app_window_geometry_cache.cc index deefc7a..22ad90c 100644 --- a/apps/app_window_geometry_cache.cc +++ b/apps/app_window_geometry_cache.cc @@ -10,7 +10,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "extensions/browser/extension_prefs.h" @@ -306,8 +306,7 @@ AppWindowGeometryCache::Factory::Factory() AppWindowGeometryCache::Factory::~Factory() {} -BrowserContextKeyedService* -AppWindowGeometryCache::Factory::BuildServiceInstanceFor( +KeyedService* AppWindowGeometryCache::Factory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); return new AppWindowGeometryCache(profile, diff --git a/apps/app_window_geometry_cache.h b/apps/app_window_geometry_cache.h index 372be6d..1bc69fa 100644 --- a/apps/app_window_geometry_cache.h +++ b/apps/app_window_geometry_cache.h @@ -15,8 +15,8 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/ui_base_types.h" @@ -33,7 +33,7 @@ namespace apps { // A cache for persisted geometry of app windows, both to not have to wait // for IO when creating a new window, and to not cause IO on every window // geometry change. -class AppWindowGeometryCache : public BrowserContextKeyedService, +class AppWindowGeometryCache : public KeyedService, public content::NotificationObserver { public: class Factory : public BrowserContextKeyedServiceFactory { @@ -51,7 +51,7 @@ class AppWindowGeometryCache : public BrowserContextKeyedService, virtual ~Factory(); // BrowserContextKeyedServiceFactory - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( @@ -91,7 +91,7 @@ class AppWindowGeometryCache : public BrowserContextKeyedService, gfx::Rect* screen_bounds, ui::WindowShowState* state); - // BrowserContextKeyedService + // KeyedService virtual void Shutdown() OVERRIDE; void AddObserver(Observer* observer); diff --git a/apps/app_window_registry.cc b/apps/app_window_registry.cc index 42b9465..82d8293 100644 --- a/apps/app_window_registry.cc +++ b/apps/app_window_registry.cc @@ -6,7 +6,7 @@ #include "apps/app_window_registry.h" #include "apps/apps_client.h" #include "apps/ui/native_app_window.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_manager.h" @@ -285,7 +285,7 @@ AppWindowRegistry::Factory::Factory() AppWindowRegistry::Factory::~Factory() {} -BrowserContextKeyedService* AppWindowRegistry::Factory::BuildServiceInstanceFor( +KeyedService* AppWindowRegistry::Factory::BuildServiceInstanceFor( content::BrowserContext* context) const { return new AppWindowRegistry(context); } diff --git a/apps/app_window_registry.h b/apps/app_window_registry.h index 2a3dfa5..5be2079 100644 --- a/apps/app_window_registry.h +++ b/apps/app_window_registry.h @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/memory/singleton.h" #include "base/observer_list.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" +#include "components/keyed_service/core/keyed_service.h" #include "ui/gfx/native_widget_types.h" namespace content { @@ -27,7 +27,7 @@ class AppWindow; // The AppWindowRegistry tracks the AppWindows for all platform apps for a // particular browser context. -class AppWindowRegistry : public BrowserContextKeyedService { +class AppWindowRegistry : public KeyedService { public: class Observer { public: @@ -115,7 +115,7 @@ class AppWindowRegistry : public BrowserContextKeyedService { virtual ~Factory(); // BrowserContextKeyedServiceFactory - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; diff --git a/apps/saved_files_service.h b/apps/saved_files_service.h index 4c86a0c..aa7909b 100644 --- a/apps/saved_files_service.h +++ b/apps/saved_files_service.h @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/stl_util.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -56,7 +56,7 @@ struct SavedFileEntry { // Tracks the files that apps have retained access to both while running and // when suspended. -class SavedFilesService : public BrowserContextKeyedService, +class SavedFilesService : public KeyedService, public content::NotificationObserver { public: explicit SavedFilesService(Profile* profile); diff --git a/apps/saved_files_service_factory.cc b/apps/saved_files_service_factory.cc index c904770..94dcf31 100644 --- a/apps/saved_files_service_factory.cc +++ b/apps/saved_files_service_factory.cc @@ -6,7 +6,7 @@ #include "apps/saved_files_service.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace apps { @@ -28,7 +28,7 @@ SavedFilesServiceFactory::SavedFilesServiceFactory() SavedFilesServiceFactory::~SavedFilesServiceFactory() {} -BrowserContextKeyedService* SavedFilesServiceFactory::BuildServiceInstanceFor( +KeyedService* SavedFilesServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new SavedFilesService(static_cast<Profile*>(profile)); } diff --git a/apps/saved_files_service_factory.h b/apps/saved_files_service_factory.h index 502010f..d8bc3ee 100644 --- a/apps/saved_files_service_factory.h +++ b/apps/saved_files_service_factory.h @@ -6,7 +6,7 @@ #define APPS_SAVED_FILES_SERVICE_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -26,7 +26,7 @@ class SavedFilesServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~SavedFilesServiceFactory(); friend struct DefaultSingletonTraits<SavedFilesServiceFactory>; - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc index 559c3c9..e506e81 100644 --- a/apps/shell/browser/shell_browser_main_parts.cc +++ b/apps/shell/browser/shell_browser_main_parts.cc @@ -15,7 +15,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/run_loop.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "content/public/common/result_codes.h" #include "content/shell/browser/shell_devtools_delegate.h" #include "content/shell/browser/shell_net_log.h" @@ -41,7 +41,7 @@ using extensions::ShellExtensionSystem; namespace apps { namespace { -// Register additional BrowserContextKeyedService factories here. See +// Register additional KeyedService factories here. See // ChromeBrowserMainExtraPartsProfiles for details. void EnsureBrowserContextKeyedServiceFactoriesBuilt() { extensions::RendererStartupHelperFactory::GetInstance(); @@ -117,7 +117,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { AppsClient::Set(apps_client_.get()); // Create our custom ExtensionSystem first because other - // BrowserContextKeyedServices depend on it. + // KeyedServices depend on it. // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt. CreateExtensionSystem(); diff --git a/apps/shell/browser/shell_browser_main_parts.h b/apps/shell/browser/shell_browser_main_parts.h index fb40160e..653e90d 100644 --- a/apps/shell/browser/shell_browser_main_parts.h +++ b/apps/shell/browser/shell_browser_main_parts.h @@ -102,7 +102,7 @@ class ShellBrowserMainParts : public content::BrowserMainParts, scoped_ptr<content::ShellDevToolsDelegate> devtools_delegate_; - // Owned by the BrowserContextKeyedService system. + // Owned by the KeyedService system. extensions::ShellExtensionSystem* extension_system_; DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts); diff --git a/apps/shell/browser/shell_extension_system.h b/apps/shell/browser/shell_extension_system.h index 39004117..c45505d 100644 --- a/apps/shell/browser/shell_extension_system.h +++ b/apps/shell/browser/shell_extension_system.h @@ -43,7 +43,7 @@ class ShellExtensionSystem : public ExtensionSystem { // Closes the running app. void CloseApp(); - // BrowserContextKeyedService implementation: + // KeyedService implementation: virtual void Shutdown() OVERRIDE; // ExtensionSystem implementation: diff --git a/apps/shell/browser/shell_extension_system_factory.cc b/apps/shell/browser/shell_extension_system_factory.cc index 46fed8f..42a5b9e 100644 --- a/apps/shell/browser/shell_extension_system_factory.cc +++ b/apps/shell/browser/shell_extension_system_factory.cc @@ -5,7 +5,7 @@ #include "apps/shell/browser/shell_extension_system_factory.h" #include "apps/shell/browser/shell_extension_system.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_registry_factory.h" @@ -33,9 +33,8 @@ ShellExtensionSystemFactory::ShellExtensionSystemFactory() ShellExtensionSystemFactory::~ShellExtensionSystemFactory() {} -BrowserContextKeyedService* -ShellExtensionSystemFactory::BuildServiceInstanceFor(BrowserContext* context) - const { +KeyedService* ShellExtensionSystemFactory::BuildServiceInstanceFor( + BrowserContext* context) const { return new ShellExtensionSystem(context); } diff --git a/apps/shell/browser/shell_extension_system_factory.h b/apps/shell/browser/shell_extension_system_factory.h index 2173fb5..b273a20 100644 --- a/apps/shell/browser/shell_extension_system_factory.h +++ b/apps/shell/browser/shell_extension_system_factory.h @@ -26,7 +26,7 @@ class ShellExtensionSystemFactory : public ExtensionSystemProvider { virtual ~ShellExtensionSystemFactory(); // BrowserContextKeyedServiceFactory implementation: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index b214bfb..64b2dfb 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -16,6 +16,7 @@ include_rules = [ "+components/browser_context_keyed_service", "+components/dom_distiller", "+components/encryptor", + "+components/keyed_service", "+components/language_usage_metrics", "+components/nacl/browser", "+components/nacl/common", diff --git a/chrome/browser/apps/ephemeral_app_service.h b/chrome/browser/apps/ephemeral_app_service.h index 2ea34f1..ac8dea3 100644 --- a/chrome/browser/apps/ephemeral_app_service.h +++ b/chrome/browser/apps/ephemeral_app_service.h @@ -9,7 +9,7 @@ #include <set> #include "base/timer/timer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -20,7 +20,7 @@ class Extension; } // namespace extensions // Performs the background garbage collection of ephemeral apps. -class EphemeralAppService : public BrowserContextKeyedService, +class EphemeralAppService : public KeyedService, public content::NotificationObserver { public: // Returns the instance for the given profile. This is a convenience wrapper diff --git a/chrome/browser/apps/ephemeral_app_service_factory.cc b/chrome/browser/apps/ephemeral_app_service_factory.cc index d7f3206..143c47d 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.cc +++ b/chrome/browser/apps/ephemeral_app_service_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/apps/ephemeral_app_service.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -34,7 +34,7 @@ EphemeralAppServiceFactory::EphemeralAppServiceFactory() EphemeralAppServiceFactory::~EphemeralAppServiceFactory() { } -BrowserContextKeyedService* EphemeralAppServiceFactory::BuildServiceInstanceFor( +KeyedService* EphemeralAppServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { return new EphemeralAppService(Profile::FromBrowserContext(context)); } diff --git a/chrome/browser/apps/ephemeral_app_service_factory.h b/chrome/browser/apps/ephemeral_app_service_factory.h index b8f1c19..54c0bdd 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.h +++ b/chrome/browser/apps/ephemeral_app_service_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_APPS_EPHEMERAL_APP_SERVICE_FACTORY_H_ #include "base/memory/singleton.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 EphemeralAppService; class Profile; @@ -24,7 +24,7 @@ class EphemeralAppServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~EphemeralAppServiceFactory(); // BrowserContextKeyedServiceFactory implementation: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/apps/per_app_settings_service.h b/chrome/browser/apps/per_app_settings_service.h index 5832ca3..161a6da 100644 --- a/chrome/browser/apps/per_app_settings_service.h +++ b/chrome/browser/apps/per_app_settings_service.h @@ -9,11 +9,11 @@ #include <string> #include "chrome/browser/ui/host_desktop.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" // Stores settings for apps that only persist until the browser context is // destroyed. -class PerAppSettingsService : public BrowserContextKeyedService { +class PerAppSettingsService : public KeyedService { public: PerAppSettingsService(); virtual ~PerAppSettingsService(); diff --git a/chrome/browser/apps/per_app_settings_service_factory.cc b/chrome/browser/apps/per_app_settings_service_factory.cc index a750629..c7f008d 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.cc +++ b/chrome/browser/apps/per_app_settings_service_factory.cc @@ -6,7 +6,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/apps/per_app_settings_service.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extensions_browser_client.h" // static @@ -30,8 +30,7 @@ PerAppSettingsServiceFactory::PerAppSettingsServiceFactory() PerAppSettingsServiceFactory::~PerAppSettingsServiceFactory() {} -BrowserContextKeyedService* -PerAppSettingsServiceFactory::BuildServiceInstanceFor( +KeyedService* PerAppSettingsServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { return new PerAppSettingsService; } diff --git a/chrome/browser/apps/per_app_settings_service_factory.h b/chrome/browser/apps/per_app_settings_service_factory.h index 730d9d9..28a232b 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.h +++ b/chrome/browser/apps/per_app_settings_service_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_APPS_PER_APP_SETTINGS_SERVICE_FACTORY_H_ #define CHROME_BROWSER_APPS_PER_APP_SETTINGS_SERVICE_FACTORY_H_ -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace content { class BrowserContext; @@ -27,7 +27,7 @@ class PerAppSettingsServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~PerAppSettingsServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( diff --git a/chrome/browser/apps/shortcut_manager.h b/chrome/browser/apps/shortcut_manager.h index e5cfc14..e5b5ccc 100644 --- a/chrome/browser/apps/shortcut_manager.h +++ b/chrome/browser/apps/shortcut_manager.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/common/extension.h" @@ -20,7 +20,7 @@ class PrefRegistrySyncable; } // This class manages the installation of shortcuts for platform apps. -class AppShortcutManager : public BrowserContextKeyedService, +class AppShortcutManager : public KeyedService, public content::NotificationObserver, public ProfileInfoCacheObserver { public: diff --git a/chrome/browser/apps/shortcut_manager_factory.cc b/chrome/browser/apps/shortcut_manager_factory.cc index d3f73ad..8a8cb4e 100644 --- a/chrome/browser/apps/shortcut_manager_factory.cc +++ b/chrome/browser/apps/shortcut_manager_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/apps/shortcut_manager.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" // static AppShortcutManager* AppShortcutManagerFactory::GetForProfile(Profile* profile) { @@ -28,7 +28,7 @@ AppShortcutManagerFactory::AppShortcutManagerFactory() AppShortcutManagerFactory::~AppShortcutManagerFactory() { } -BrowserContextKeyedService* AppShortcutManagerFactory::BuildServiceInstanceFor( +KeyedService* AppShortcutManagerFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new AppShortcutManager(static_cast<Profile*>(profile)); } diff --git a/chrome/browser/apps/shortcut_manager_factory.h b/chrome/browser/apps/shortcut_manager_factory.h index 166ec9f..1ebc5f1 100644 --- a/chrome/browser/apps/shortcut_manager_factory.h +++ b/chrome/browser/apps/shortcut_manager_factory.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_APPS_SHORTCUT_MANAGER_FACTORY_H_ #define CHROME_BROWSER_APPS_SHORTCUT_MANAGER_FACTORY_H_ -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" template<typename Type> struct DefaultSingletonTraits; @@ -30,7 +30,7 @@ class AppShortcutManagerFactory : public BrowserContextKeyedServiceFactory { virtual ~AppShortcutManagerFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc index 7e6dec0..a488b51 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc @@ -14,7 +14,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -141,8 +141,7 @@ KioskAppUpdateServiceFactory* KioskAppUpdateServiceFactory::GetInstance() { return Singleton<KioskAppUpdateServiceFactory>::get(); } -BrowserContextKeyedService* -KioskAppUpdateServiceFactory::BuildServiceInstanceFor( +KeyedService* KioskAppUpdateServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { return new KioskAppUpdateService( Profile::FromBrowserContext(context), diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index 491647c..70dc075 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h @@ -12,8 +12,8 @@ #include "base/memory/singleton.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" +#include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/update_observer.h" class Profile; @@ -29,7 +29,7 @@ class AutomaticRebootManager; } // This class enforces automatic restart on app and Chrome updates in app mode. -class KioskAppUpdateService : public BrowserContextKeyedService, +class KioskAppUpdateService : public KeyedService, public extensions::UpdateObserver, public system::AutomaticRebootManagerObserver { public: @@ -47,7 +47,7 @@ class KioskAppUpdateService : public BrowserContextKeyedService, void StartAppUpdateRestartTimer(); void ForceAppUpdateRestart(); - // BrowserContextKeyedService overrides: + // KeyedService overrides: virtual void Shutdown() OVERRIDE; // extensions::UpdateObserver overrides: @@ -88,7 +88,7 @@ class KioskAppUpdateServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~KioskAppUpdateServiceFactory(); // BrowserContextKeyedServiceFactory overrides: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc index 8be176f..8e1bc05 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.cc @@ -11,8 +11,8 @@ #include "base/time/time.h" #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -45,7 +45,7 @@ class KioskDiagnosisRunner::Factory : public BrowserContextKeyedServiceFactory { virtual ~Factory() {} // BrowserContextKeyedServiceFactory overrides: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE { Profile* profile = static_cast<Profile*>(context); return new KioskDiagnosisRunner(profile); diff --git a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h index bb2608c..afdbbec 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h +++ b/chrome/browser/chromeos/app_mode/kiosk_diagnosis_runner.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/api/feedback_private/feedback_service.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class Profile; @@ -18,7 +18,7 @@ namespace chromeos { // A class to run diagnose for kiosk app. Currently, it only schedules a // feedback to collected. -class KioskDiagnosisRunner : public BrowserContextKeyedService { +class KioskDiagnosisRunner : public KeyedService { public: // Run diagnostic jobs for |app_id|. static void Run(Profile* profile, const std::string& app_id); diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index bb744c7..f21dfd7 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc @@ -37,7 +37,7 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/user_agent.h" @@ -608,8 +608,7 @@ DriveIntegrationServiceFactory::DriveIntegrationServiceFactory() DriveIntegrationServiceFactory::~DriveIntegrationServiceFactory() { } -BrowserContextKeyedService* -DriveIntegrationServiceFactory::BuildServiceInstanceFor( +KeyedService* DriveIntegrationServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h index b5ce9a6..ffa243d 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.h +++ b/chrome/browser/chromeos/drive/drive_integration_service.h @@ -14,8 +14,8 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/drive/drive_notification_observer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" +#include "components/keyed_service/core/keyed_service.h" namespace base { class FilePath; @@ -62,9 +62,8 @@ class DriveIntegrationServiceObserver { // The class is essentially a container that manages lifetime of the objects // that are used to integrate Drive to Chrome. The object of this class is // created per-profile. -class DriveIntegrationService - : public BrowserContextKeyedService, - public DriveNotificationObserver { +class DriveIntegrationService : public KeyedService, + public DriveNotificationObserver { public: class PreferenceWatcher; @@ -83,7 +82,7 @@ class DriveIntegrationService FileSystemInterface* test_file_system); virtual ~DriveIntegrationService(); - // BrowserContextKeyedService override: + // KeyedService override: virtual void Shutdown() OVERRIDE; void SetEnabled(bool enabled); @@ -225,7 +224,7 @@ class DriveIntegrationServiceFactory virtual ~DriveIntegrationServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; // This is static so it can be set without instantiating the factory. This diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h index da52434..2c9eff3 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_ #include "base/memory/scoped_ptr.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class Profile; @@ -15,12 +15,12 @@ namespace file_manager { class EventRouter; // Manages and registers the fileBrowserPrivate API with the extension system. -class FileBrowserPrivateAPI : public BrowserContextKeyedService { +class FileBrowserPrivateAPI : public KeyedService { public: explicit FileBrowserPrivateAPI(Profile* profile); virtual ~FileBrowserPrivateAPI(); - // BrowserContextKeyedService overrides. + // KeyedService overrides. virtual void Shutdown() OVERRIDE; // Convenience function to return the FileBrowserPrivateAPI for a Profile. diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc index 5ab4149..3f1b5e1 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -41,8 +41,7 @@ FileBrowserPrivateAPIFactory::FileBrowserPrivateAPIFactory() FileBrowserPrivateAPIFactory::~FileBrowserPrivateAPIFactory() { } -BrowserContextKeyedService* -FileBrowserPrivateAPIFactory::BuildServiceInstanceFor( +KeyedService* FileBrowserPrivateAPIFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { return new FileBrowserPrivateAPI(Profile::FromBrowserContext(context)); } diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h index d652203..a2e841f 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -37,7 +37,7 @@ class FileBrowserPrivateAPIFactory : public BrowserContextKeyedServiceFactory { virtual ~FileBrowserPrivateAPIFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; }; diff --git a/chrome/browser/chromeos/extensions/install_limiter.h b/chrome/browser/chromeos/extensions/install_limiter.h index e9b3ec1..ae7cd1a 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.h +++ b/chrome/browser/chromeos/extensions/install_limiter.h @@ -15,7 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/extensions/crx_installer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -24,7 +24,7 @@ namespace extensions { // InstallLimiter defers big app installs after all small app installs and then // runs big app installs one by one. This improves first-time login experience. // See http://crbug.com/166296 -class InstallLimiter : public BrowserContextKeyedService, +class InstallLimiter : public KeyedService, public content::NotificationObserver, public base::SupportsWeakPtr<InstallLimiter> { public: diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.cc b/chrome/browser/chromeos/extensions/install_limiter_factory.cc index eeb5660..e93d54a 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.cc +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/chromeos/extensions/install_limiter.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -33,7 +33,7 @@ InstallLimiterFactory::InstallLimiterFactory() InstallLimiterFactory::~InstallLimiterFactory() { } -BrowserContextKeyedService* InstallLimiterFactory::BuildServiceInstanceFor( +KeyedService* InstallLimiterFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new InstallLimiter(); } diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.h b/chrome/browser/chromeos/extensions/install_limiter_factory.h index 8fe950f..6575295 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.h +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/singleton.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 Profile; @@ -30,7 +30,7 @@ class InstallLimiterFactory : public BrowserContextKeyedServiceFactory { virtual ~InstallLimiterFactory(); // BrowserContextKeyedServiceFactory overrides: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; DISALLOW_COPY_AND_ASSIGN(InstallLimiterFactory); diff --git a/chrome/browser/chromeos/file_manager/volume_manager.h b/chrome/browser/chromeos/file_manager/volume_manager.h index ec74330..530d363 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager.h +++ b/chrome/browser/chromeos/file_manager/volume_manager.h @@ -17,7 +17,7 @@ #include "chrome/browser/local_discovery/storage/privet_volume_lister.h" #include "chromeos/dbus/cros_disks_client.h" #include "chromeos/disks/disk_mount_manager.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class Profile; @@ -98,7 +98,7 @@ struct VolumeInfo { // - Removable disks (volume will be created for each partition, not only one // for a device). // - Mounted zip archives. -class VolumeManager : public BrowserContextKeyedService, +class VolumeManager : public KeyedService, public drive::DriveIntegrationServiceObserver, public chromeos::disks::DiskMountManager::Observer { public: diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc index 2df1005..6000848 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc @@ -12,7 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/disks/disk_mount_manager.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace file_manager { @@ -39,7 +39,7 @@ bool VolumeManagerFactory::ServiceIsNULLWhileTesting() const { return true; } -BrowserContextKeyedService* VolumeManagerFactory::BuildServiceInstanceFor( +KeyedService* VolumeManagerFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { VolumeManager* instance = new VolumeManager( Profile::FromBrowserContext(profile), diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.h b/chrome/browser/chromeos/file_manager/volume_manager_factory.h index 8532522..4aed950 100644 --- a/chrome/browser/chromeos/file_manager/volume_manager_factory.h +++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.h @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_FACTORY_H_ @@ -34,7 +34,7 @@ class VolumeManagerFactory : public BrowserContextKeyedServiceFactory { virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; // BrowserContextKeyedServiceFactory overrides: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; private: diff --git a/chrome/browser/chromeos/login/auth_sync_observer.h b/chrome/browser/chromeos/login/auth_sync_observer.h index 063736a..f5f093d 100644 --- a/chrome/browser/chromeos/login/auth_sync_observer.h +++ b/chrome/browser/chromeos/login/auth_sync_observer.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/sync/profile_sync_service_observer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class Profile; @@ -18,7 +18,7 @@ namespace chromeos { // This class is responsible for detecting authentication problems reported // by sync service and -class AuthSyncObserver : public BrowserContextKeyedService, +class AuthSyncObserver : public KeyedService, public ProfileSyncServiceObserver { public: explicit AuthSyncObserver(Profile* user_profile); @@ -29,7 +29,7 @@ class AuthSyncObserver : public BrowserContextKeyedService, private: friend class AuthSyncObserverFactory; - // BrowserContextKeyedService implementation. + // KeyedService implementation. virtual void Shutdown() OVERRIDE; // ProfileSyncServiceObserver implementation. diff --git a/chrome/browser/chromeos/login/auth_sync_observer_factory.cc b/chrome/browser/chromeos/login/auth_sync_observer_factory.cc index 4121082..1917d70 100644 --- a/chrome/browser/chromeos/login/auth_sync_observer_factory.cc +++ b/chrome/browser/chromeos/login/auth_sync_observer_factory.cc @@ -7,7 +7,7 @@ #include "chrome/browser/chromeos/login/auth_sync_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service_factory.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace chromeos { @@ -34,8 +34,7 @@ AuthSyncObserverFactory* return Singleton<AuthSyncObserverFactory>::get(); } -BrowserContextKeyedService* -AuthSyncObserverFactory::BuildServiceInstanceFor( +KeyedService* AuthSyncObserverFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); return new AuthSyncObserver(profile); diff --git a/chrome/browser/chromeos/login/auth_sync_observer_factory.h b/chrome/browser/chromeos/login/auth_sync_observer_factory.h index 3b06d54..408a089 100644 --- a/chrome/browser/chromeos/login/auth_sync_observer_factory.h +++ b/chrome/browser/chromeos/login/auth_sync_observer_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_AUTH_SYNC_OBSERVER_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -34,7 +34,7 @@ class AuthSyncObserverFactory virtual ~AuthSyncObserverFactory(); // BrowserContextKeyedServiceFactory implementation. - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; DISALLOW_COPY_AND_ASSIGN(AuthSyncObserverFactory); diff --git a/chrome/browser/chromeos/login/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/multi_profile_user_controller_unittest.cc index d3b4207..1c6884d 100644 --- a/chrome/browser/chromeos/login/multi_profile_user_controller_unittest.cc +++ b/chrome/browser/chromeos/login/multi_profile_user_controller_unittest.cc @@ -88,8 +88,7 @@ const BehaviorTestCase kBehaviorTestCases[] = { // we've ensured the profile has been shut down. policy::PolicyCertVerifier* g_policy_cert_verifier_for_factory = NULL; -BrowserContextKeyedService* TestPolicyCertServiceFactory( - content::BrowserContext* context) { +KeyedService* TestPolicyCertServiceFactory(content::BrowserContext* context) { return policy::PolicyCertService::CreateForTesting( kUsers[0], g_policy_cert_verifier_for_factory, UserManager::Get()) .release(); diff --git a/chrome/browser/chromeos/login/oauth2_login_manager.h b/chrome/browser/chromeos/login/oauth2_login_manager.h index 12b1fc7..12b1773 100644 --- a/chrome/browser/chromeos/login/oauth2_login_manager.h +++ b/chrome/browser/chromeos/login/oauth2_login_manager.h @@ -12,7 +12,7 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/login/oauth2_login_verifier.h" #include "chrome/browser/chromeos/login/oauth2_token_fetcher.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "google_apis/gaia/gaia_oauth_client.h" #include "google_apis/gaia/oauth2_token_service.h" #include "net/url_request/url_request_context_getter.h" @@ -25,7 +25,7 @@ namespace chromeos { // This class is responsible for restoring authenticated web sessions out of // OAuth2 refresh tokens or pre-authenticated cookie jar. -class OAuth2LoginManager : public BrowserContextKeyedService, +class OAuth2LoginManager : public KeyedService, public gaia::GaiaOAuthClient::Delegate, public OAuth2LoginVerifier::Delegate, public OAuth2TokenFetcher::Delegate, @@ -144,7 +144,7 @@ class OAuth2LoginManager : public BrowserContextKeyedService, POST_MERGE_COUNT = 7, }; - // BrowserContextKeyedService implementation. + // KeyedService implementation. virtual void Shutdown() OVERRIDE; // gaia::GaiaOAuthClient::Delegate overrides. diff --git a/chrome/browser/chromeos/login/oauth2_login_manager_factory.cc b/chrome/browser/chromeos/login/oauth2_login_manager_factory.cc index a5dd8d4..a7d829d 100644 --- a/chrome/browser/chromeos/login/oauth2_login_manager_factory.cc +++ b/chrome/browser/chromeos/login/oauth2_login_manager_factory.cc @@ -9,7 +9,7 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace chromeos { @@ -38,8 +38,7 @@ OAuth2LoginManagerFactory* return Singleton<OAuth2LoginManagerFactory>::get(); } -BrowserContextKeyedService* -OAuth2LoginManagerFactory::BuildServiceInstanceFor( +KeyedService* OAuth2LoginManagerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); OAuth2LoginManager* service; diff --git a/chrome/browser/chromeos/login/oauth2_login_manager_factory.h b/chrome/browser/chromeos/login/oauth2_login_manager_factory.h index 8de820e7..03be445 100644 --- a/chrome/browser/chromeos/login/oauth2_login_manager_factory.h +++ b/chrome/browser/chromeos/login/oauth2_login_manager_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH2_LOGIN_MANAGER_FACTORY_H_ #include "base/memory/singleton.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 Profile; @@ -34,7 +34,7 @@ class OAuth2LoginManagerFactory virtual ~OAuth2LoginManagerFactory(); // BrowserContextKeyedServiceFactory implementation. - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManagerFactory); diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h index c00c791..7d4c194 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h @@ -12,7 +12,7 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/login/user.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class Profile; @@ -29,7 +29,7 @@ namespace chromeos { // Enforces a limit on the length of time for which a user authenticated via // SAML can use offline authentication against a cached password before being // forced to go through online authentication against GAIA again. -class SAMLOfflineSigninLimiter : public BrowserContextKeyedService { +class SAMLOfflineSigninLimiter : public KeyedService { public: // Registers preferences. static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); @@ -38,7 +38,7 @@ class SAMLOfflineSigninLimiter : public BrowserContextKeyedService { // the type of authentication flow that the user went through. void SignedIn(UserContext::AuthFlow auth_flow); - // BrowserContextKeyedService: + // KeyedService: virtual void Shutdown() OVERRIDE; private: diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc index 5cc9407..c524726 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc @@ -7,8 +7,8 @@ #include "base/time/clock.h" #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/browser_context.h" namespace chromeos { @@ -42,9 +42,8 @@ SAMLOfflineSigninLimiterFactory::SAMLOfflineSigninLimiterFactory() SAMLOfflineSigninLimiterFactory::~SAMLOfflineSigninLimiterFactory() { } -BrowserContextKeyedService* - SAMLOfflineSigninLimiterFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { +KeyedService* SAMLOfflineSigninLimiterFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { return new SAMLOfflineSigninLimiter(static_cast<Profile*>(context), clock_for_testing_); } diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h index a3533c8..298ffc4 100644 --- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h +++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/singleton.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 Profile; @@ -40,7 +40,7 @@ class SAMLOfflineSigninLimiterFactory virtual ~SAMLOfflineSigninLimiterFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; static base::Clock* clock_for_testing_; diff --git a/chrome/browser/chromeos/policy/policy_cert_service.h b/chrome/browser/chromeos/policy/policy_cert_service.h index 464e89e..c514ba1 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service.h +++ b/chrome/browser/chromeos/policy/policy_cert_service.h @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" namespace chromeos { class UserManager; @@ -35,7 +35,7 @@ class PolicyCertVerifier; // Except for unit tests, PolicyCertVerifier should only be created through this // class. class PolicyCertService - : public BrowserContextKeyedService, + : public KeyedService, public UserNetworkConfigurationUpdater::WebTrustedCertsObserver { public: PolicyCertService(const std::string& user_id, @@ -58,7 +58,7 @@ class PolicyCertService virtual void OnTrustAnchorsChanged(const net::CertificateList& trust_anchors) OVERRIDE; - // BrowserContextKeyedService: + // KeyedService: virtual void Shutdown() OVERRIDE; static scoped_ptr<PolicyCertService> CreateForTesting( diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc index 9b5d5f0..9e37f44 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc @@ -17,7 +17,7 @@ #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/user_prefs/pref_registry_syncable.h" namespace policy { @@ -89,7 +89,7 @@ PolicyCertServiceFactory::PolicyCertServiceFactory() PolicyCertServiceFactory::~PolicyCertServiceFactory() {} -BrowserContextKeyedService* PolicyCertServiceFactory::BuildServiceInstanceFor( +KeyedService* PolicyCertServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.h b/chrome/browser/chromeos/policy/policy_cert_service_factory.h index eaa269b..b3c9d4e 100644 --- a/chrome/browser/chromeos/policy/policy_cert_service_factory.h +++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" template <typename T> struct DefaultSingletonTraits; @@ -55,7 +55,7 @@ class PolicyCertServiceFactory : public BrowserContextKeyedServiceFactory { virtual ~PolicyCertServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h index 0f192de..4149ddb 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/prefs/pref_change_registrar.h" #include "base/timer/timer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -26,14 +26,14 @@ namespace policy { // a session is being started and whenever recommended values change during a // user session. On the login screen, user settings are cleared when the user // becomes idle for one minute. -class RecommendationRestorer : public BrowserContextKeyedService, +class RecommendationRestorer : public KeyedService, public content::NotificationObserver, public ash::UserActivityObserver { public: explicit RecommendationRestorer(Profile* profile); virtual ~RecommendationRestorer(); - // BrowserContextKeyedService: + // KeyedService: virtual void Shutdown() OVERRIDE; // content::NotificationObserver: diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc b/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc index 59cab9a..23961aa 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/chromeos/policy/recommendation_restorer.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" namespace policy { @@ -23,9 +23,8 @@ RecommendationRestorer* RecommendationRestorerFactory::GetForProfile( GetInstance()->GetServiceForBrowserContext(profile, false)); } -BrowserContextKeyedService* - RecommendationRestorerFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { +KeyedService* RecommendationRestorerFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { return new RecommendationRestorer(static_cast<Profile*>(context)); } diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h index 9b5cda2..5d36fba 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer_factory.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer_factory.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/singleton.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 Profile; @@ -24,7 +24,7 @@ class RecommendationRestorerFactory : public BrowserContextKeyedServiceFactory { protected: // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h index 3c402c3..285aea9 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/cloud_policy_manager.h" @@ -40,11 +40,10 @@ class WildcardLoginChecker; // UserCloudPolicyManagerChromeOS implements logic for initializing user policy // on Chrome OS. -class UserCloudPolicyManagerChromeOS - : public CloudPolicyManager, - public CloudPolicyClient::Observer, - public CloudPolicyService::Observer, - public BrowserContextKeyedService { +class UserCloudPolicyManagerChromeOS : public CloudPolicyManager, + public CloudPolicyClient::Observer, + public CloudPolicyService::Observer, + public KeyedService { public: // If |wait_for_policy_fetch| is true, IsInitializationComplete() will return // false as long as there hasn't been a successful policy fetch. @@ -74,7 +73,7 @@ class UserCloudPolicyManagerChromeOS // This class is one of the policy providers, and must be ready for the // creation of the Profile's PrefService; all the other - // BrowserContextKeyedServices depend on the PrefService, so this class can't + // KeyedServices depend on the PrefService, so this class can't // depend on other BCKS to avoid a circular dependency. So instead of using // the ProfileOAuth2TokenService directly to get the access token, a 3rd // service (UserCloudPolicyTokenForwarder) will fetch it later and pass it diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc index c7d976e..b696431 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc @@ -29,7 +29,7 @@ #include "chromeos/chromeos_paths.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/policy/core/common/cloud/cloud_external_data_manager.h" #include "components/policy/core/common/cloud/device_management_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h index d746067..fe3dbc0 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" -#include "components/browser_context_keyed_service/browser_context_keyed_base_factory.h" +#include "components/keyed_service/content/browser_context_keyed_base_factory.h" class Profile; @@ -31,14 +31,14 @@ class UserCloudPolicyManagerChromeOS; // cloud policy settings on ChromeOS. // // UserCloudPolicyManagerChromeOS is handled different than other -// BrowserContextKeyedServices because it is a dependency of PrefService. +// KeyedServices because it is a dependency of PrefService. // Therefore, lifetime of instances is managed by Profile, Profile startup code // invokes CreateForProfile() explicitly, takes ownership, and the instance // is only deleted after PrefService destruction. // // TODO(mnissler): Remove the special lifetime management in favor of // PrefService directly depending on UserCloudPolicyManagerChromeOS once the -// former has been converted to a BrowserContextKeyedService. +// former has been converted to a KeyedService. // See also http://crbug.com/131843 and http://crbug.com/131844. class UserCloudPolicyManagerFactoryChromeOS : public BrowserContextKeyedBaseFactory { diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h index 1cdbfbb..04148d8 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_TOKEN_FORWARDER_H_ #include "base/basictypes.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_service.h" #include "google_apis/gaia/oauth2_token_service.h" @@ -22,7 +22,7 @@ class UserCloudPolicyManagerChromeOS; // ready. This service decouples the UserCloudPolicyManagerChromeOS from // depending directly on the ProfileOAuth2TokenService, since it is initialized // much earlier. -class UserCloudPolicyTokenForwarder : public BrowserContextKeyedService, +class UserCloudPolicyTokenForwarder : public KeyedService, public OAuth2TokenService::Observer, public OAuth2TokenService::Consumer, public CloudPolicyService::Observer { @@ -35,7 +35,7 @@ class UserCloudPolicyTokenForwarder : public BrowserContextKeyedService, SigninManagerBase* signin_manager); virtual ~UserCloudPolicyTokenForwarder(); - // BrowserContextKeyedService: + // KeyedService: virtual void Shutdown() OVERRIDE; // OAuth2TokenService::Observer: diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc index 586cddc..29750e5 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc @@ -12,7 +12,7 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" namespace policy { @@ -33,9 +33,8 @@ UserCloudPolicyTokenForwarderFactory::UserCloudPolicyTokenForwarderFactory() UserCloudPolicyTokenForwarderFactory::~UserCloudPolicyTokenForwarderFactory() {} -BrowserContextKeyedService* - UserCloudPolicyTokenForwarderFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { +KeyedService* UserCloudPolicyTokenForwarderFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); UserCloudPolicyManagerChromeOS* manager = UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile); diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h index 3ccc7c0..b138507 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h +++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/singleton.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" namespace content { class BrowserContext; @@ -30,7 +30,7 @@ class UserCloudPolicyTokenForwarderFactory virtual ~UserCloudPolicyTokenForwarderFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.h b/chrome/browser/chromeos/policy/user_network_configuration_updater.h index 5ced0fd..9c93c2f 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.h @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/policy/network_configuration_updater.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -46,7 +46,7 @@ class PolicyService; // expansion with the user's name (or email address, etc.) and handling of "Web" // trust of certificates. class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater, - public BrowserContextKeyedService, + public KeyedService, public content::NotificationObserver { public: class WebTrustedCertsObserver { diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc index 04bda5a..b773490 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chromeos/network/network_handler.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" namespace policy { @@ -59,8 +59,7 @@ bool UserNetworkConfigurationUpdaterFactory::ServiceIsNULLWhileTesting() const { return true; } -BrowserContextKeyedService* -UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor( +KeyedService* UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = static_cast<Profile*>(context); if (chromeos::ProfileHelper::IsSigninProfile(profile)) diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h index 5249994..52257b9 100644 --- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h +++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" template <typename T> struct DefaultSingletonTraits; @@ -40,7 +40,7 @@ class UserNetworkConfigurationUpdaterFactory content::BrowserContext* context) const OVERRIDE; virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const OVERRIDE; DISALLOW_COPY_AND_ASSIGN(UserNetworkConfigurationUpdaterFactory); diff --git a/chrome/browser/managed_mode/chromeos/managed_user_password_service.h b/chrome/browser/managed_mode/chromeos/managed_user_password_service.h index 6d787cf..e6fbb52 100644 --- a/chrome/browser/managed_mode/chromeos/managed_user_password_service.h +++ b/chrome/browser/managed_mode/chromeos/managed_user_password_service.h @@ -12,9 +12,9 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" -class ManagedUserPasswordService : public BrowserContextKeyedService { +class ManagedUserPasswordService : public KeyedService { public: ManagedUserPasswordService(); virtual ~ManagedUserPasswordService(); diff --git a/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc b/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc index 7458140..78ce695 100644 --- a/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc +++ b/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc @@ -11,8 +11,7 @@ #include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" - +#include "components/keyed_service/content/browser_context_dependency_manager.h" // static ManagedUserPasswordService* @@ -37,8 +36,7 @@ ManagedUserPasswordServiceFactory::ManagedUserPasswordServiceFactory() ManagedUserPasswordServiceFactory:: ~ManagedUserPasswordServiceFactory() {} -BrowserContextKeyedService* -ManagedUserPasswordServiceFactory::BuildServiceInstanceFor( +KeyedService* ManagedUserPasswordServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile= static_cast<Profile*>(context); chromeos::User* user = chromeos::UserManager::Get()-> diff --git a/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h b/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h index 2e7be21..5369b3d 100644 --- a/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h +++ b/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/managed_mode/managed_users.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 ManagedUserPasswordService; class Profile; @@ -26,7 +26,7 @@ class ManagedUserPasswordServiceFactory virtual ~ManagedUserPasswordServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/managed_mode/chromeos/manager_password_service.h b/chrome/browser/managed_mode/chromeos/manager_password_service.h index ff43968..abb4536 100644 --- a/chrome/browser/managed_mode/chromeos/manager_password_service.h +++ b/chrome/browser/managed_mode/chromeos/manager_password_service.h @@ -13,9 +13,9 @@ #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" #include "chrome/browser/managed_mode/managed_user_sync_service.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" -class ManagerPasswordService : public BrowserContextKeyedService { +class ManagerPasswordService : public KeyedService { public: ManagerPasswordService(); virtual ~ManagerPasswordService(); diff --git a/chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc b/chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc index 4a7d83c..1d700f0 100644 --- a/chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc +++ b/chrome/browser/managed_mode/chromeos/manager_password_service_factory.cc @@ -12,7 +12,7 @@ #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" // static ManagerPasswordService* @@ -38,8 +38,7 @@ ManagerPasswordServiceFactory::ManagerPasswordServiceFactory() ManagerPasswordServiceFactory:: ~ManagerPasswordServiceFactory() {} -BrowserContextKeyedService* -ManagerPasswordServiceFactory::BuildServiceInstanceFor( +KeyedService* ManagerPasswordServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile= static_cast<Profile*>(context); chromeos::User* user = chromeos::UserManager::Get()-> diff --git a/chrome/browser/managed_mode/chromeos/manager_password_service_factory.h b/chrome/browser/managed_mode/chromeos/manager_password_service_factory.h index 034d86f..a403126 100644 --- a/chrome/browser/managed_mode/chromeos/manager_password_service_factory.h +++ b/chrome/browser/managed_mode/chromeos/manager_password_service_factory.h @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/managed_mode/managed_users.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 ManagerPasswordService; class Profile; @@ -26,7 +26,7 @@ class ManagerPasswordServiceFactory virtual ~ManagerPasswordServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/managed_mode/custodian_profile_downloader_service.h b/chrome/browser/managed_mode/custodian_profile_downloader_service.h index a600c96..5092b8d 100644 --- a/chrome/browser/managed_mode/custodian_profile_downloader_service.h +++ b/chrome/browser/managed_mode/custodian_profile_downloader_service.h @@ -8,9 +8,9 @@ #include "base/callback.h" #include "chrome/browser/profiles/profile_downloader.h" #include "chrome/browser/profiles/profile_downloader_delegate.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" -class CustodianProfileDownloaderService : public BrowserContextKeyedService, +class CustodianProfileDownloaderService : public KeyedService, public ProfileDownloaderDelegate { public: // Callback for DownloadProfile() below. If the GAIA profile download is @@ -20,7 +20,7 @@ class CustodianProfileDownloaderService : public BrowserContextKeyedService, virtual ~CustodianProfileDownloaderService(); - // BrowserContextKeyedService: + // KeyedService: virtual void Shutdown() OVERRIDE; // Downloads the GAIA account information for the |custodian_profile_|. @@ -49,7 +49,7 @@ class CustodianProfileDownloaderService : public BrowserContextKeyedService, scoped_ptr<ProfileDownloader> profile_downloader_; DownloadProfileCallback download_callback_; - // Owns us via the BrowserContextKeyedService mechanism. + // Owns us via the KeyedService mechanism. Profile* custodian_profile_; std::string last_downloaded_profile_email_; diff --git a/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.cc b/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.cc index cf5b04e..1957f44a 100644 --- a/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.cc +++ b/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.cc @@ -7,7 +7,7 @@ #include "chrome/browser/managed_mode/custodian_profile_downloader_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" // static CustodianProfileDownloaderService* @@ -35,8 +35,7 @@ CustodianProfileDownloaderServiceFactory() CustodianProfileDownloaderServiceFactory:: ~CustodianProfileDownloaderServiceFactory() {} -BrowserContextKeyedService* -CustodianProfileDownloaderServiceFactory::BuildServiceInstanceFor( +KeyedService* CustodianProfileDownloaderServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new CustodianProfileDownloaderService(static_cast<Profile*>(profile)); } diff --git a/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h b/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h index c4cbbeb..42a21e6 100644 --- a/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h +++ b/chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_MANAGED_MODE_CUSTODIAN_PROFILE_DOWNLOADER_SERVICE_FACTORY_H_ #include "base/memory/singleton.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 CustodianProfileDownloaderService; class Profile; @@ -26,7 +26,7 @@ class CustodianProfileDownloaderServiceFactory virtual ~CustodianProfileDownloaderServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.cc b/chrome/browser/managed_mode/managed_user_registration_utility.cc index 0299706..769f257 100644 --- a/chrome/browser/managed_mode/managed_user_registration_utility.cc +++ b/chrome/browser/managed_mode/managed_user_registration_utility.cc @@ -95,10 +95,10 @@ class ManagedUserRegistrationUtilityImpl PrefService* prefs_; scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher_; - // A |BrowserContextKeyedService| owned by the custodian profile. + // A |KeyedService| owned by the custodian profile. ManagedUserSyncService* managed_user_sync_service_; - // A |BrowserContextKeyedService| owned by the custodian profile. + // A |KeyedService| owned by the custodian profile. ManagedUserSharedSettingsService* managed_user_shared_settings_service_; std::string pending_managed_user_id_; diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.h b/chrome/browser/managed_mode/managed_user_registration_utility.h index d5b66db..c53517b 100644 --- a/chrome/browser/managed_mode/managed_user_registration_utility.h +++ b/chrome/browser/managed_mode/managed_user_registration_utility.h @@ -17,7 +17,7 @@ #include "chrome/browser/managed_mode/managed_user_sync_service.h" #include "chrome/browser/managed_mode/managed_user_sync_service_observer.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class GoogleServiceAuthError; class ManagedUserRefreshTokenFetcher; diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h index ee1f938..4fcaaca 100644 --- a/chrome/browser/managed_mode/managed_user_service.h +++ b/chrome/browser/managed_mode/managed_user_service.h @@ -16,7 +16,7 @@ #include "chrome/browser/managed_mode/managed_users.h" #include "chrome/browser/sync/profile_sync_service_observer.h" #include "chrome/browser/ui/browser_list_observer.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents.h" @@ -37,7 +37,7 @@ class PrefRegistrySyncable; // This class handles all the information related to a given managed profile // (e.g. the installed content packs, the default URL filtering behavior, or // manual whitelist/blacklist overrides). -class ManagedUserService : public BrowserContextKeyedService, +class ManagedUserService : public KeyedService, public extensions::ManagementPolicy::Provider, public ProfileSyncServiceObserver, public content::NotificationObserver, @@ -230,7 +230,7 @@ class ManagedUserService : public BrowserContextKeyedService, // Each entry is a dictionary which has the timestamp of the event. void RecordProfileAndBrowserEventsHelper(const char* key_prefix); - // Owns us via the BrowserContextKeyedService mechanism. + // Owns us via the KeyedService mechanism. Profile* profile_; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/managed_mode/managed_user_service_factory.cc b/chrome/browser/managed_mode/managed_user_service_factory.cc index a4a992f..249adaa 100644 --- a/chrome/browser/managed_mode/managed_user_service_factory.cc +++ b/chrome/browser/managed_mode/managed_user_service_factory.cc @@ -8,7 +8,7 @@ #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_system_provider.h" #include "extensions/browser/extensions_browser_client.h" @@ -24,8 +24,7 @@ ManagedUserServiceFactory* ManagedUserServiceFactory::GetInstance() { } // static -BrowserContextKeyedService* ManagedUserServiceFactory::BuildInstanceFor( - Profile* profile) { +KeyedService* ManagedUserServiceFactory::BuildInstanceFor(Profile* profile) { return new ManagedUserService(profile); } @@ -45,7 +44,7 @@ content::BrowserContext* ManagedUserServiceFactory::GetBrowserContextToUse( return chrome::GetBrowserContextRedirectedInIncognito(context); } -BrowserContextKeyedService* ManagedUserServiceFactory::BuildServiceInstanceFor( +KeyedService* ManagedUserServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return BuildInstanceFor(static_cast<Profile*>(profile)); } diff --git a/chrome/browser/managed_mode/managed_user_service_factory.h b/chrome/browser/managed_mode/managed_user_service_factory.h index 4071209..059439c 100644 --- a/chrome/browser/managed_mode/managed_user_service_factory.h +++ b/chrome/browser/managed_mode/managed_user_service_factory.h @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/managed_mode/managed_users.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 ManagedUserService; class Profile; @@ -19,7 +19,7 @@ class ManagedUserServiceFactory : public BrowserContextKeyedServiceFactory { static ManagedUserServiceFactory* GetInstance(); // Used to create instances for testing. - static BrowserContextKeyedService* BuildInstanceFor(Profile* profile); + static KeyedService* BuildInstanceFor(Profile* profile); private: friend struct DefaultSingletonTraits<ManagedUserServiceFactory>; @@ -30,7 +30,7 @@ class ManagedUserServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; diff --git a/chrome/browser/managed_mode/managed_user_settings_service.h b/chrome/browser/managed_mode/managed_user_settings_service.h index cc03c01..ee342f3 100644 --- a/chrome/browser/managed_mode/managed_user_settings_service.h +++ b/chrome/browser/managed_mode/managed_user_settings_service.h @@ -14,7 +14,7 @@ #include "base/prefs/pref_store.h" #include "base/values.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "sync/api/syncable_service.h" class PersistentPrefStore; @@ -49,7 +49,7 @@ class SequencedTaskRunner; // } // would be encoded as two sync items, one with key "Moose:foo" and value "bar", // and one with key "Moose:baz" and value "blurp". -class ManagedUserSettingsService : public BrowserContextKeyedService, +class ManagedUserSettingsService : public KeyedService, public syncer::SyncableService, public PrefStore::Observer { public: @@ -107,7 +107,7 @@ class ManagedUserSettingsService : public BrowserContextKeyedService, static syncer::SyncData CreateSyncDataForSetting(const std::string& name, const base::Value& value); - // BrowserContextKeyedService implementation: + // KeyedService implementation: virtual void Shutdown() OVERRIDE; // SyncableService implementation: diff --git a/chrome/browser/managed_mode/managed_user_settings_service_factory.cc b/chrome/browser/managed_mode/managed_user_settings_service_factory.cc index 2c7062e..51f1a84f 100644 --- a/chrome/browser/managed_mode/managed_user_settings_service_factory.cc +++ b/chrome/browser/managed_mode/managed_user_settings_service_factory.cc @@ -7,7 +7,7 @@ #include "chrome/browser/managed_mode/managed_user_settings_service.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" // static ManagedUserSettingsService* @@ -31,8 +31,7 @@ ManagedUserSettingsServiceFactory::ManagedUserSettingsServiceFactory() ManagedUserSettingsServiceFactory:: ~ManagedUserSettingsServiceFactory() {} -BrowserContextKeyedService* -ManagedUserSettingsServiceFactory::BuildServiceInstanceFor( +KeyedService* ManagedUserSettingsServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new ManagedUserSettingsService(); } diff --git a/chrome/browser/managed_mode/managed_user_settings_service_factory.h b/chrome/browser/managed_mode/managed_user_settings_service_factory.h index 2e53273..084966c 100644 --- a/chrome/browser/managed_mode/managed_user_settings_service_factory.h +++ b/chrome/browser/managed_mode/managed_user_settings_service_factory.h @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/managed_mode/managed_users.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 ManagedUserSettingsService; class Profile; @@ -26,7 +26,7 @@ class ManagedUserSettingsServiceFactory virtual ~ManagedUserSettingsServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; virtual content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const OVERRIDE; diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_service.h b/chrome/browser/managed_mode/managed_user_shared_settings_service.h index a69b5dd..dcae009 100644 --- a/chrome/browser/managed_mode/managed_user_shared_settings_service.h +++ b/chrome/browser/managed_mode/managed_user_shared_settings_service.h @@ -9,7 +9,7 @@ #include "base/callback_list.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "sync/api/syncable_service.h" class PrefService; @@ -34,7 +34,7 @@ class PrefRegistrySyncable; // and an "acknowledged" flag, which is used to wait for the Sync server to // acknowledge that it has seen a setting change (see // ManagedUserSharedSettingsUpdate for how to use this). -class ManagedUserSharedSettingsService : public BrowserContextKeyedService, +class ManagedUserSharedSettingsService : public KeyedService, public syncer::SyncableService { public: // Called whenever a setting changes (see Subscribe() below). @@ -85,7 +85,7 @@ class ManagedUserSharedSettingsService : public BrowserContextKeyedService, const base::Value& value, bool acknowledged); - // BrowserContextKeyedService implementation: + // KeyedService implementation: virtual void Shutdown() OVERRIDE; // SyncableService implementation: diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.cc b/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.cc index 8552228..53f8836 100644 --- a/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.cc +++ b/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.cc @@ -5,7 +5,7 @@ #include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h" #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" @@ -32,8 +32,7 @@ ManagedUserSharedSettingsServiceFactory:: ManagedUserSharedSettingsServiceFactory:: ~ManagedUserSharedSettingsServiceFactory() {} -BrowserContextKeyedService* -ManagedUserSharedSettingsServiceFactory::BuildServiceInstanceFor( +KeyedService* ManagedUserSharedSettingsServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new ManagedUserSharedSettingsService( user_prefs::UserPrefs::Get(profile)); diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h b/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h index bc99219..6f4a0ac 100644 --- a/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h +++ b/chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/managed_mode/managed_users.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 ManagedUserSharedSettingsService; @@ -26,7 +26,7 @@ class ManagedUserSharedSettingsServiceFactory virtual ~ManagedUserSharedSettingsServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; diff --git a/chrome/browser/managed_mode/managed_user_sync_service.h b/chrome/browser/managed_mode/managed_user_sync_service.h index 729c35a..c15a488c 100644 --- a/chrome/browser/managed_mode/managed_user_sync_service.h +++ b/chrome/browser/managed_mode/managed_user_sync_service.h @@ -13,7 +13,7 @@ #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/managed_mode/managed_user_sync_service_observer.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" #include "sync/api/syncable_service.h" namespace base { @@ -26,7 +26,7 @@ class PrefRegistrySyncable; class PrefService; -class ManagedUserSyncService : public BrowserContextKeyedService, +class ManagedUserSyncService : public KeyedService, public syncer::SyncableService { public: // For use with GetManagedUsersAsync() below. @@ -96,7 +96,7 @@ class ManagedUserSyncService : public BrowserContextKeyedService, // managed by this custodian. void GetManagedUsersAsync(const ManagedUsersCallback& callback); - // BrowserContextKeyedService implementation: + // KeyedService implementation: virtual void Shutdown() OVERRIDE; // SyncableService implementation: diff --git a/chrome/browser/managed_mode/managed_user_sync_service_factory.cc b/chrome/browser/managed_mode/managed_user_sync_service_factory.cc index ca2b074..76b3169 100644 --- a/chrome/browser/managed_mode/managed_user_sync_service_factory.cc +++ b/chrome/browser/managed_mode/managed_user_sync_service_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/managed_mode/managed_user_sync_service.h" #include "chrome/browser/profiles/profile.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" // static ManagedUserSyncService* ManagedUserSyncServiceFactory::GetForProfile( @@ -28,8 +28,7 @@ ManagedUserSyncServiceFactory::ManagedUserSyncServiceFactory() ManagedUserSyncServiceFactory::~ManagedUserSyncServiceFactory() {} -BrowserContextKeyedService* -ManagedUserSyncServiceFactory::BuildServiceInstanceFor( +KeyedService* ManagedUserSyncServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new ManagedUserSyncService(static_cast<Profile*>(profile)->GetPrefs()); } diff --git a/chrome/browser/managed_mode/managed_user_sync_service_factory.h b/chrome/browser/managed_mode/managed_user_sync_service_factory.h index 079f2e9..11f7de3 100644 --- a/chrome/browser/managed_mode/managed_user_sync_service_factory.h +++ b/chrome/browser/managed_mode/managed_user_sync_service_factory.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SYNC_SERVICE_FACTORY_H_ #include "base/memory/singleton.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 ManagedUserSyncService; class Profile; @@ -25,7 +25,7 @@ class ManagedUserSyncServiceFactory virtual ~ManagedUserSyncServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service.h b/chrome/browser/managed_mode/supervised_user_pref_mapping_service.h index b9c25ad..1f0f96c 100644 --- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service.h +++ b/chrome/browser/managed_mode/supervised_user_pref_mapping_service.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/managed_mode/managed_users.h" -#include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "components/keyed_service/core/keyed_service.h" class ManagedUserSharedSettingsService; class PrefService; @@ -19,7 +19,7 @@ class PrefService; // SupervisedUserPrefMappingService maps shared managed user settings to user // preferences. When a shared managed user setting is updated via sync, the // corresponding local user preference is set to this new value. -class SupervisedUserPrefMappingService : public BrowserContextKeyedService { +class SupervisedUserPrefMappingService : public KeyedService { public: typedef base::CallbackList<void(const std::string&, const std::string&)> CallbackList; @@ -29,7 +29,7 @@ class SupervisedUserPrefMappingService : public BrowserContextKeyedService { ManagedUserSharedSettingsService* shared_settings); virtual ~SupervisedUserPrefMappingService(); - // BrowserContextKeyedService implementation: + // KeyedService implementation: virtual void Shutdown() OVERRIDE; void Init(); diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc b/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc index 6b8d85f..bef54d8 100644 --- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc +++ b/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.cc @@ -6,7 +6,7 @@ #include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h" #include "chrome/browser/managed_mode/supervised_user_pref_mapping_service.h" -#include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" @@ -35,8 +35,7 @@ SupervisedUserPrefMappingServiceFactory:: SupervisedUserPrefMappingServiceFactory:: ~SupervisedUserPrefMappingServiceFactory() {} -BrowserContextKeyedService* -SupervisedUserPrefMappingServiceFactory::BuildServiceInstanceFor( +KeyedService* SupervisedUserPrefMappingServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { return new SupervisedUserPrefMappingService( user_prefs::UserPrefs::Get(profile), diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.h b/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.h index c0be0c2..5258f64 100644 --- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.h +++ b/chrome/browser/managed_mode/supervised_user_pref_mapping_service_factory.h @@ -7,7 +7,7 @@ #include "base/memory/singleton.h" #include "chrome/browser/managed_mode/managed_users.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 SupervisedUserPrefMappingService; @@ -26,7 +26,7 @@ class SupervisedUserPrefMappingServiceFactory virtual ~SupervisedUserPrefMappingServiceFactory(); // BrowserContextKeyedServiceFactory: - virtual BrowserContextKeyedService* BuildServiceInstanceFor( + virtual KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const OVERRIDE; }; |