Move extensions-related files to using //components/keyed_service.
This CL removes the usage of //components/browser_context_keyed_service
from:
- //chrome/browser/extensions
- //extensions
It was constructed using the following:
- move_source_file.py --already_moved
- mffr.py
- git cl format
BUG=351704
TBR=yoz
Review URL: https://codereview.chromium.org/197413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256853 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h
index 8040c2ef..a959d2b0 100644
--- a/chrome/browser/extensions/activity_log/activity_log.h
+++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -53,7 +53,7 @@
static BrowserContextKeyedAPIFactory<ActivityLog>* GetFactoryInstance();
- // ActivityLog is a BrowserContextKeyedService, so don't instantiate it with
+ // ActivityLog is a KeyedService, so don't instantiate it with
// the constructor; use GetInstance instead.
static ActivityLog* GetInstance(content::BrowserContext* context);
@@ -98,7 +98,7 @@
const std::string& api_name,
scoped_ptr<base::ListValue> event_args) OVERRIDE;
- // BrowserContextKeyedService
+ // KeyedService
virtual void Shutdown() OVERRIDE;
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
index 1ca0f880..c8a00b91 100644
--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
@@ -235,7 +235,7 @@
}
template <>
-BrowserContextKeyedService*
+KeyedService*
BrowserContextKeyedAPIFactory<AutotestPrivateAPI>::BuildServiceInstanceFor(
content::BrowserContext* context) const {
return new AutotestPrivateAPI();
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.h b/chrome/browser/extensions/api/autotest_private/autotest_private_api.h
index 817524660cf..213b9d7 100644
--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.h
+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.h
@@ -111,7 +111,7 @@
};
template <>
-BrowserContextKeyedService*
+KeyedService*
BrowserContextKeyedAPIFactory<AutotestPrivateAPI>::BuildServiceInstanceFor(
content::BrowserContext* context) const;
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
index 53263ec..6b842ea 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
@@ -48,7 +48,7 @@
ExtensionBluetoothEventRouter* bluetooth_event_router();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// EventRouter::Observer implementation.
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc
index 3c32d87d..7842636 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc
@@ -75,8 +75,7 @@
DISALLOW_COPY_AND_ASSIGN(FakeExtensionSystem);
};
-BrowserContextKeyedService* BuildFakeExtensionSystem(
- content::BrowserContext* profile) {
+KeyedService* BuildFakeExtensionSystem(content::BrowserContext* profile) {
return new FakeExtensionSystem(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
index 7191028..8da38d8c 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h
@@ -78,7 +78,7 @@
explicit BookmarksAPI(content::BrowserContext* context);
virtual ~BookmarksAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h
index 35a9f20..0a1ed11 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.h
+++ b/chrome/browser/extensions/api/cookies/cookies_api.h
@@ -199,7 +199,7 @@
explicit CookiesAPI(content::BrowserContext* context);
virtual ~CookiesAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
index 71e5c11..64091d89 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
@@ -109,7 +109,7 @@
return last_unpacked_directory_;
}
- // BrowserContextKeyedService implementation
+ // KeyedService implementation
virtual void Shutdown() OVERRIDE;
// EventRouter::Observer implementation.
diff --git a/chrome/browser/extensions/api/dial/dial_api.h b/chrome/browser/extensions/api/dial/dial_api.h
index 7e07c22..e1d982c 100644
--- a/chrome/browser/extensions/api/dial/dial_api.h
+++ b/chrome/browser/extensions/api/dial/dial_api.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/dial/dial_device_data.h"
#include "chrome/browser/extensions/api/dial/dial_registry.h"
-#include "components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h"
+#include "components/keyed_service/content/refcounted_browser_context_keyed_service.h"
#include "extensions/browser/api/async_api_function.h"
#include "extensions/browser/event_router.h"
@@ -17,7 +17,7 @@
class DialRegistry;
-// Dial API which is a ref-counted BrowserContextKeyedService that manages
+// Dial API which is a ref-counted KeyedService that manages
// the DIAL registry. It takes care of creating the registry on the IO thread
// and is an observer of the registry. It makes sure devices events are sent out
// to extension listeners on the right thread.
diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.cc b/chrome/browser/extensions/api/dial/dial_api_factory.cc
index 193d57d2..63e2f70 100644
--- a/chrome/browser/extensions/api/dial/dial_api_factory.cc
+++ b/chrome/browser/extensions/api/dial/dial_api_factory.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/extensions/api/dial/dial_api_factory.h"
#include "chrome/browser/extensions/api/dial/dial_api.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"
diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.h b/chrome/browser/extensions/api/dial/dial_api_factory.h
index f5fb18e..035ec6d 100644
--- a/chrome/browser/extensions/api/dial/dial_api_factory.h
+++ b/chrome/browser/extensions/api/dial/dial_api_factory.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_FACTORY_H_
#include "base/memory/singleton.h"
-#include "components/browser_context_keyed_service/refcounted_browser_context_keyed_service_factory.h"
+#include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h"
namespace extensions {
diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h
index 1a73b24..be40b13d 100644
--- a/chrome/browser/extensions/api/history/history_api.h
+++ b/chrome/browser/extensions/api/history/history_api.h
@@ -58,7 +58,7 @@
explicit HistoryAPI(content::BrowserContext* context);
virtual ~HistoryAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
index 7d08ddc..5cf863f5 100644
--- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
+++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
@@ -28,7 +28,7 @@
service_available_ = available;
}
- static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
+ static KeyedService* Build(content::BrowserContext* profile) {
return new MockHotwordService(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
index 65297bf7..120cbd9 100644
--- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc
+++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
@@ -119,8 +119,7 @@
idle_manager_->OnListenerRemoved(details);
}
-BrowserContextKeyedService* IdleManagerTestFactory(
- content::BrowserContext* profile) {
+KeyedService* IdleManagerTestFactory(content::BrowserContext* profile) {
return new IdleManager(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/api/idle/idle_manager.h b/chrome/browser/extensions/api/idle/idle_manager.h
index a300dba..b97d83c 100644
--- a/chrome/browser/extensions/api/idle/idle_manager.h
+++ b/chrome/browser/extensions/api/idle/idle_manager.h
@@ -14,7 +14,7 @@
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
#include "chrome/browser/idle.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/browser/event_router.h"
@@ -39,7 +39,7 @@
class IdleManager : public content::NotificationObserver,
public EventRouter::Observer,
- public BrowserContextKeyedService {
+ public KeyedService {
public:
class IdleTimeProvider {
public:
@@ -72,7 +72,7 @@
void Init();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// content::NotificationDelegate implementation.
diff --git a/chrome/browser/extensions/api/idle/idle_manager_factory.cc b/chrome/browser/extensions/api/idle/idle_manager_factory.cc
index ea605d5..63ca1518 100644
--- a/chrome/browser/extensions/api/idle/idle_manager_factory.cc
+++ b/chrome/browser/extensions/api/idle/idle_manager_factory.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/extensions/api/idle/idle_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"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -34,7 +34,7 @@
IdleManagerFactory::~IdleManagerFactory() {
}
-BrowserContextKeyedService* IdleManagerFactory::BuildServiceInstanceFor(
+KeyedService* IdleManagerFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
IdleManager* idle_manager = new IdleManager(static_cast<Profile*>(profile));
idle_manager->Init();
diff --git a/chrome/browser/extensions/api/idle/idle_manager_factory.h b/chrome/browser/extensions/api/idle/idle_manager_factory.h
index 2ff96053..1a9f9b74 100644
--- a/chrome/browser/extensions/api/idle/idle_manager_factory.h
+++ b/chrome/browser/extensions/api/idle/idle_manager_factory.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_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;
@@ -26,7 +26,7 @@
virtual ~IdleManagerFactory();
// BrowserContextKeyedBaseFactory implementation.
- 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/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
index 4a5ccf7..a9ad34b 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
@@ -52,8 +52,7 @@
};
// Factory function to register for the ExtensionSystem.
-BrowserContextKeyedService* BuildFakeExtensionSystem(
- content::BrowserContext* profile) {
+KeyedService* BuildFakeExtensionSystem(content::BrowserContext* profile) {
return new FakeExtensionSystem(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h
index ad6282de..9fa609d 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -12,7 +12,7 @@
#include "base/memory/singleton.h"
#include "base/values.h"
#include "chrome/browser/chromeos/input_method/input_method_engine_interface.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/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/api/management/management_api.h b/chrome/browser/extensions/api/management/management_api.h
index bef6e56..c62fa418 100644
--- a/chrome/browser/extensions/api/management/management_api.h
+++ b/chrome/browser/extensions/api/management/management_api.h
@@ -9,7 +9,7 @@
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_uninstall_dialog.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/browser/browser_context_keyed_api_factory.h"
@@ -196,7 +196,7 @@
explicit ManagementAPI(content::BrowserContext* context);
virtual ~ManagementAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
index fea564e9..71bb8ac1b 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
@@ -42,7 +42,7 @@
class MediaGalleriesEventRouter : public BrowserContextKeyedAPI,
public MediaScanManagerObserver {
public:
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h
index cb7cd0e..bb897de 100644
--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h
+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h
@@ -35,7 +35,7 @@
explicit MediaGalleriesPrivateAPI(content::BrowserContext* context);
virtual ~MediaGalleriesPrivateAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api.h b/chrome/browser/extensions/api/networking_private/networking_private_api.h
index c76e8b2..c4fe9e94 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_api.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_api.h
@@ -14,7 +14,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chromeos/dbus/dbus_method_call_status.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/keyed_service/core/keyed_service.h"
// Implements the chrome.networkingPrivate.getProperties method.
class NetworkingPrivateGetPropertiesFunction
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index ca58c84c..45c309a 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -256,8 +256,8 @@
"epcifkihnkjgphfkloaaleeakhpmgdmn");
}
- static BrowserContextKeyedService*
- CreateNetworkingPrivateServiceClient(content::BrowserContext* profile) {
+ static KeyedService* CreateNetworkingPrivateServiceClient(
+ content::BrowserContext* profile) {
return new extensions::NetworkingPrivateServiceClient(
wifi::WiFiService::CreateForTest(),
new CryptoVerifyStub());
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router.h b/chrome/browser/extensions/api/networking_private/networking_private_event_router.h
index 68f0fdb..a66e476 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_EVENT_ROUTER_H_
#define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_EVENT_ROUTER_H_
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/keyed_service/core/keyed_service.h"
#include "extensions/browser/event_router.h"
class Profile;
@@ -15,7 +15,7 @@
// This is an event router that will observe listeners to |NetworksChanged| and
// |NetworkListChanged| events. On ChromeOS it will forward these events
// from the NetworkStateHandler to the JavaScript Networking API.
-class NetworkingPrivateEventRouter : public BrowserContextKeyedService,
+class NetworkingPrivateEventRouter : public KeyedService,
public EventRouter::Observer {
public:
static NetworkingPrivateEventRouter* Create(Profile* profile);
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
index 17fb3e7..9984c21 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
@@ -16,7 +16,7 @@
#include "chromeos/network/network_state_handler_observer.h"
#include "chromeos/network/onc/onc_signature.h"
#include "chromeos/network/onc/onc_translator.h"
-#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
+#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/onc/onc_constants.h"
#include "extensions/browser/extension_system.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
@@ -35,7 +35,7 @@
virtual ~NetworkingPrivateEventRouterImpl();
protected:
- // BrowserContextKeyedService overrides:
+ // KeyedService overrides:
virtual void Shutdown() OVERRIDE;
// EventRouter::Observer overrides:
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
index cc9d812..6bff936 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/extensions/api/networking_private/networking_private_event_router.h"
#include "chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.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"
@@ -40,8 +40,7 @@
NetworkingPrivateEventRouterFactory::~NetworkingPrivateEventRouterFactory() {
}
-BrowserContextKeyedService*
-NetworkingPrivateEventRouterFactory::BuildServiceInstanceFor(
+KeyedService* NetworkingPrivateEventRouterFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
return NetworkingPrivateEventRouter::Create(
Profile::FromBrowserContext(context));
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h
index e661a30..c3bae6d 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_EVENT_ROUTER_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"
namespace extensions {
@@ -40,7 +40,7 @@
virtual ~NetworkingPrivateEventRouterFactory();
// BrowserContextKeyedServiceFactory:
- virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+ virtual KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateEventRouterFactory);
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc
index 2c44dd0..71d74f6 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc
@@ -23,7 +23,7 @@
virtual ~NetworkingPrivateEventRouterImpl();
protected:
- // BrowserContextKeyedService overrides:
+ // KeyedService overrides:
virtual void Shutdown() OVERRIDE;
// EventRouter::Observer overrides:
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
index 247a920..b2909cfc 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
@@ -17,7 +17,7 @@
#include "base/supports_user_data.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/values.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/keyed_service/core/keyed_service.h"
#include "components/wifi/wifi_service.h"
#include "content/public/browser/utility_process_host.h"
#include "content/public/browser/utility_process_host_client.h"
@@ -40,7 +40,7 @@
// them to WiFiService on worker thread to |UpdateConnectedNetwork|. Always used
// from UI thread only.
class NetworkingPrivateServiceClient
- : public BrowserContextKeyedService,
+ : public KeyedService,
net::NetworkChangeNotifier::NetworkChangeObserver {
public:
// Interface for Verify* methods implementation.
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc
index dbdd05a6..c7b00cf 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/extensions/api/networking_private/networking_private_service_client.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_thread.h"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -37,9 +37,8 @@
::~NetworkingPrivateServiceClientFactory() {
}
-BrowserContextKeyedService*
- NetworkingPrivateServiceClientFactory::BuildServiceInstanceFor(
- content::BrowserContext* profile) const {
+KeyedService* NetworkingPrivateServiceClientFactory::BuildServiceInstanceFor(
+ content::BrowserContext* profile) const {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
return new NetworkingPrivateServiceClient(
wifi::WiFiService::Create(),
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h
index 9cc75ed..85d38fb1 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_SERVICE_CLIENT_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;
@@ -28,8 +28,8 @@
virtual ~NetworkingPrivateServiceClientFactory();
// BrowserContextKeyedServiceFactory:
- virtual BrowserContextKeyedService*
- BuildServiceInstanceFor(content::BrowserContext* profile) const OVERRIDE;
+ virtual KeyedService* BuildServiceInstanceFor(
+ content::BrowserContext* profile) const OVERRIDE;
virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h
index 391ce9b..2949990 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.h
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h
@@ -100,7 +100,7 @@
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// Returns the icon to display in the omnibox for the given extension.
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
index 6ca34e64..d122cfec 100644
--- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
+++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
@@ -83,7 +83,7 @@
ChromeDirectSettingAPI::~ChromeDirectSettingAPI() {}
-// BrowserContextKeyedService implementation.
+// KeyedService implementation.
void ChromeDirectSettingAPI::Shutdown() {}
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h
index e4d517e1..f663c30f 100644
--- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h
+++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h
@@ -25,7 +25,7 @@
virtual ~ChromeDirectSettingAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h
index 5baf397..55df7a5 100644
--- a/chrome/browser/extensions/api/preference/preference_api.h
+++ b/chrome/browser/extensions/api/preference/preference_api.h
@@ -96,7 +96,7 @@
explicit PreferenceAPI(content::BrowserContext* context);
virtual ~PreferenceAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
index 0637ebb1..c92f4fb 100644
--- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc
@@ -45,7 +45,7 @@
virtual ~FakeProfileSyncService() {}
- static BrowserContextKeyedService* BuildFakeProfileSyncService(
+ static KeyedService* BuildFakeProfileSyncService(
content::BrowserContext* context) {
return new FakeProfileSyncService(static_cast<Profile*>(context));
}
diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h
index d7859d0..035a705a 100644
--- a/chrome/browser/extensions/api/processes/processes_api.h
+++ b/chrome/browser/extensions/api/processes/processes_api.h
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/browser/task_manager/task_manager.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_registrar.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_widget_host.h"
@@ -100,7 +100,7 @@
explicit ProcessesAPI(content::BrowserContext* context);
virtual ~ProcessesAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
index 59f8f69..a00af73 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
@@ -120,7 +120,7 @@
// Convenience method to get the PushMessagingAPI for a profile.
static PushMessagingAPI* Get(content::BrowserContext* context);
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/reading_list_private/reading_list_private_apitest.cc b/chrome/browser/extensions/api/reading_list_private/reading_list_private_apitest.cc
index 5dc576d7..7911ff9 100644
--- a/chrome/browser/extensions/api/reading_list_private/reading_list_private_apitest.cc
+++ b/chrome/browser/extensions/api/reading_list_private/reading_list_private_apitest.cc
@@ -23,7 +23,7 @@
class ReadingListPrivateApiTest : public ExtensionApiTest {
public:
- static BrowserContextKeyedService* Build(content::BrowserContext* context) {
+ static KeyedService* Build(content::BrowserContext* context) {
FakeDB* fake_db = new FakeDB(new FakeDB::EntryMap);
FakeDistiller* distiller = new FakeDistiller(true);
MockDistillerFactory* factory = new MockDistillerFactory();
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
index b5259ed9..37036099 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
@@ -43,7 +43,7 @@
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
void OnTemplateURLsLoaded();
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
index 3d24c2284..8b475fb 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
@@ -112,8 +112,7 @@
MOCK_METHOD0(Shutdown, void());
};
-BrowserContextKeyedService* CreateProfileSyncServiceMock(
- content::BrowserContext* profile) {
+KeyedService* CreateProfileSyncServiceMock(content::BrowserContext* profile) {
return new ProfileSyncServiceMockForExtensionTests(
Profile::FromBrowserContext(profile));
}
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc
index 02b6e94..9621438 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc
@@ -17,8 +17,7 @@
namespace extensions {
namespace {
-BrowserContextKeyedService* CreateProfileSyncServiceMock(
- content::BrowserContext* profile) {
+KeyedService* CreateProfileSyncServiceMock(content::BrowserContext* profile) {
return NULL;
}
} // namespace
diff --git a/chrome/browser/extensions/api/socket/socket_api_unittest.cc b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
index 0a851dd..f24024a 100644
--- a/chrome/browser/extensions/api/socket/socket_api_unittest.cc
+++ b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
@@ -16,8 +16,7 @@
namespace extensions {
-BrowserContextKeyedService* ApiResourceManagerTestFactory(
- content::BrowserContext* context) {
+KeyedService* ApiResourceManagerTestFactory(content::BrowserContext* context) {
content::BrowserThread::ID id;
CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
return ApiResourceManager<Socket>::CreateApiResourceManagerForTest(context,
diff --git a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_api_unittest.cc b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_api_unittest.cc
index 4a7dea3..e883e7c1 100644
--- a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_api_unittest.cc
+++ b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_api_unittest.cc
@@ -18,7 +18,7 @@
namespace extensions {
namespace core_api {
-static BrowserContextKeyedService* ApiResourceManagerTestFactory(
+static KeyedService* ApiResourceManagerTestFactory(
content::BrowserContext* context) {
content::BrowserThread::ID id;
CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
index 70d5e3b..02ef2fb 100644
--- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
+++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
@@ -18,7 +18,7 @@
namespace extensions {
namespace core_api {
-static BrowserContextKeyedService* ApiResourceManagerTestFactory(
+static KeyedService* ApiResourceManagerTestFactory(
content::BrowserContext* context) {
content::BrowserThread::ID id;
CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
@@ -26,7 +26,7 @@
ResumableTCPSocket>::CreateApiResourceManagerForTest(context, id);
}
-static BrowserContextKeyedService* ApiResourceManagerTestServerFactory(
+static KeyedService* ApiResourceManagerTestServerFactory(
content::BrowserContext* context) {
content::BrowserThread::ID id;
CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
diff --git a/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc b/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc
index 05f22b9..78299fe 100644
--- a/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc
+++ b/chrome/browser/extensions/api/sockets_udp/sockets_udp_api_unittest.cc
@@ -21,7 +21,7 @@
namespace extensions {
namespace core_api {
-static BrowserContextKeyedService* ApiResourceManagerTestFactory(
+static KeyedService* ApiResourceManagerTestFactory(
content::BrowserContext* context) {
content::BrowserThread::ID id;
CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
diff --git a/chrome/browser/extensions/api/storage/storage_api_unittest.cc b/chrome/browser/extensions/api/storage/storage_api_unittest.cc
index b6a1fd0f..3b8ccd29 100644
--- a/chrome/browser/extensions/api/storage/storage_api_unittest.cc
+++ b/chrome/browser/extensions/api/storage/storage_api_unittest.cc
@@ -30,7 +30,7 @@
namespace {
// Caller owns the returned object.
-BrowserContextKeyedService* CreateSettingsFrontendForTesting(
+KeyedService* CreateSettingsFrontendForTesting(
content::BrowserContext* context) {
return SettingsFrontend::CreateForTesting(new LeveldbSettingsStorageFactory(),
context);
@@ -91,7 +91,7 @@
TEST_F(StorageApiUnittest, RestoreCorruptedStorage) {
// Ensure a SettingsFrontend can be created on demand. The SettingsFrontend
- // will be owned by the BrowserContextKeyedService system.
+ // will be owned by the KeyedService system.
SettingsFrontend::GetFactoryInstance()->SetTestingFactory(
profile(), &CreateSettingsFrontendForTesting);
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.h b/chrome/browser/extensions/api/streams_private/streams_private_api.h
index 45f0b39..c266de32 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_api.h
+++ b/chrome/browser/extensions/api/streams_private/streams_private_api.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/values.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/browser/browser_context_keyed_api_factory.h"
diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h
index f4913353..f94f891 100644
--- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h
+++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h
@@ -35,7 +35,7 @@
void InitializeForService(
sync_file_system::SyncFileSystemService* sync_service);
- // BrowserContextKeyedService override.
+ // KeyedService override.
virtual void Shutdown() OVERRIDE;
// sync_file_system::SyncEventObserver interface implementation.
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
index f7b8e75d..fb677408 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
@@ -11,7 +11,7 @@
#include "base/memory/linked_ptr.h"
#include "base/threading/thread_checker.h"
#include "chrome/browser/extensions/extension_action_icon_factory.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/browser/event_router.h"
@@ -30,12 +30,12 @@
// that are currently visible in the UI. Use SystemIndicatorManagerFactory to
// create a SystemIndicatorManager object.
class SystemIndicatorManager : public content::NotificationObserver,
- public BrowserContextKeyedService {
+ public KeyedService {
public:
SystemIndicatorManager(Profile* profile, StatusTray* status_tray);
virtual ~SystemIndicatorManager();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// content::NotificationDelegate implementation.
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc
index 0fe2575..28c4ded 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/system_indicator/system_indicator_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"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -34,8 +34,7 @@
SystemIndicatorManagerFactory::~SystemIndicatorManagerFactory() {}
-BrowserContextKeyedService*
-SystemIndicatorManagerFactory::BuildServiceInstanceFor(
+KeyedService* SystemIndicatorManagerFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
StatusTray* status_tray = g_browser_process->status_tray();
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h
index ad6f3d9..0a88e75 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_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;
@@ -27,7 +27,7 @@
virtual ~SystemIndicatorManagerFactory();
// BrowserContextKeyedBaseFactory implementation.
- virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+ virtual KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const OVERRIDE;
};
diff --git a/chrome/browser/extensions/api/system_info/system_info_api.h b/chrome/browser/extensions/api/system_info/system_info_api.h
index 88e08a9..f70e799 100644
--- a/chrome/browser/extensions/api/system_info/system_info_api.h
+++ b/chrome/browser/extensions/api/system_info/system_info_api.h
@@ -21,7 +21,7 @@
explicit SystemInfoAPI(content::BrowserContext* context);
virtual ~SystemInfoAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// EventRouter::Observer implementation.
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index d591d0f..31a52d7 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/fullscreen/fullscreen_controller.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_thread.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/extensions/api/tabs/tabs_windows_api.h b/chrome/browser/extensions/api/tabs/tabs_windows_api.h
index a5d25b2c..42c5ff6 100644
--- a/chrome/browser/extensions/api/tabs/tabs_windows_api.h
+++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_WINDOWS_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"
#include "extensions/browser/browser_context_keyed_api_factory.h"
#include "extensions/browser/event_router.h"
@@ -26,7 +26,7 @@
TabsEventRouter* tabs_event_router();
WindowsEventRouter* windows_event_router();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
index effdabf..49d70c0 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
@@ -229,7 +229,7 @@
explicit WebNavigationAPI(content::BrowserContext* context);
virtual ~WebNavigationAPI();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc
index a90dad4..1e78ced 100644
--- a/chrome/browser/extensions/extension_action_manager.cc
+++ b/chrome/browser/extensions/extension_action_manager.cc
@@ -12,8 +12,8 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/extension_action/action_info.h"
#include "chrome/common/extensions/api/extension_action/page_action_handler.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/notification_service.h"
#include "content/public/browser/notification_source.h"
#include "extensions/browser/extension_system.h"
@@ -45,7 +45,7 @@
BrowserContextDependencyManager::GetInstance()) {
}
- virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+ virtual KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const OVERRIDE {
return new ExtensionActionManager(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/extension_action_manager.h b/chrome/browser/extensions/extension_action_manager.h
index 2316205..fc50b083 100644
--- a/chrome/browser/extensions/extension_action_manager.h
+++ b/chrome/browser/extensions/extension_action_manager.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/memory/linked_ptr.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"
@@ -22,7 +22,7 @@
// Owns the ExtensionActions associated with each extension. These actions live
// while an extension is loaded and are destroyed on unload.
-class ExtensionActionManager : public BrowserContextKeyedService,
+class ExtensionActionManager : public KeyedService,
public content::NotificationObserver {
public:
explicit ExtensionActionManager(Profile* profile);
diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h
index 5940b8b5..e5e3af7 100644
--- a/chrome/browser/extensions/extension_sync_service.h
+++ b/chrome/browser/extensions/extension_sync_service.h
@@ -12,7 +12,7 @@
#include "chrome/browser/extensions/app_sync_bundle.h"
#include "chrome/browser/extensions/extension_sync_bundle.h"
#include "chrome/browser/extensions/pending_enables.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/keyed_service/core/keyed_service.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/common/extension.h"
#include "sync/api/string_ordinal.h"
@@ -38,7 +38,7 @@
}
class ExtensionSyncService : public syncer::SyncableService,
- public BrowserContextKeyedService {
+ public KeyedService {
public:
ExtensionSyncService(Profile* profile,
extensions::ExtensionPrefs* extension_prefs,
diff --git a/chrome/browser/extensions/extension_sync_service_factory.cc b/chrome/browser/extensions/extension_sync_service_factory.cc
index e72a58d..23b0c132 100644
--- a/chrome/browser/extensions/extension_sync_service_factory.cc
+++ b/chrome/browser/extensions/extension_sync_service_factory.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/extensions/extension_sync_service.h"
#include "chrome/browser/extensions/extension_system_factory.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.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -35,9 +35,8 @@
ExtensionSyncServiceFactory::~ExtensionSyncServiceFactory() {}
-BrowserContextKeyedService*
- ExtensionSyncServiceFactory::BuildServiceInstanceFor(
- content::BrowserContext* context) const {
+KeyedService* ExtensionSyncServiceFactory::BuildServiceInstanceFor(
+ content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
return new ExtensionSyncService(
profile,
diff --git a/chrome/browser/extensions/extension_sync_service_factory.h b/chrome/browser/extensions/extension_sync_service_factory.h
index 0c9e838..853c81e4 100644
--- a/chrome/browser/extensions/extension_sync_service_factory.h
+++ b/chrome/browser/extensions/extension_sync_service_factory.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.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 ExtensionSyncService;
class Profile;
@@ -24,7 +24,7 @@
ExtensionSyncServiceFactory();
virtual ~ExtensionSyncServiceFactory();
- 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/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index 1448589..1c08cf2 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/policy/profile_policy_connector_factory.h"
#include "chrome/browser/profiles/profile.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"
#include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/extension_registry_factory.h"
#include "extensions/browser/extension_system.h"
@@ -46,8 +46,7 @@
ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() {
}
-BrowserContextKeyedService*
-ExtensionSystemSharedFactory::BuildServiceInstanceFor(
+KeyedService* ExtensionSystemSharedFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
return new ExtensionSystemImpl::Shared(static_cast<Profile*>(context));
}
@@ -83,7 +82,7 @@
ExtensionSystemFactory::~ExtensionSystemFactory() {
}
-BrowserContextKeyedService* ExtensionSystemFactory::BuildServiceInstanceFor(
+KeyedService* ExtensionSystemFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
return new ExtensionSystemImpl(static_cast<Profile*>(context));
}
diff --git a/chrome/browser/extensions/extension_system_factory.h b/chrome/browser/extensions/extension_system_factory.h
index 02d25ba..d775453 100644
--- a/chrome/browser/extensions/extension_system_factory.h
+++ b/chrome/browser/extensions/extension_system_factory.h
@@ -7,7 +7,7 @@
#include "base/memory/singleton.h"
#include "chrome/browser/extensions/extension_system_impl.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 "extensions/browser/extension_system_provider.h"
namespace extensions {
@@ -29,7 +29,7 @@
virtual ~ExtensionSystemSharedFactory();
// BrowserContextKeyedServiceFactory implementation:
- virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+ virtual KeyedService* BuildServiceInstanceFor(
content::BrowserContext* context) const OVERRIDE;
virtual content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const OVERRIDE;
@@ -54,7 +54,7 @@
virtual ~ExtensionSystemFactory();
// 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/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index 23f7116..90c8c820 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -19,15 +19,15 @@
// The ExtensionSystem for ProfileImpl and OffTheRecordProfileImpl.
// Implementation details: non-shared services are owned by
-// ExtensionSystemImpl, a BrowserContextKeyedService with separate incognito
-// instances. A private Shared class (also a BrowserContextKeyedService,
+// ExtensionSystemImpl, a KeyedService with separate incognito
+// instances. A private Shared class (also a KeyedService,
// but with a shared instance for incognito) keeps the common services.
class ExtensionSystemImpl : public ExtensionSystem {
public:
explicit ExtensionSystemImpl(Profile* profile);
virtual ~ExtensionSystemImpl();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE;
@@ -63,7 +63,7 @@
// Owns the Extension-related systems that have a single instance
// shared between normal and incognito profiles.
- class Shared : public BrowserContextKeyedService {
+ class Shared : public KeyedService {
public:
explicit Shared(Profile* profile);
virtual ~Shared();
@@ -74,7 +74,7 @@
void RegisterManagementPolicyProviders();
void Init(bool extensions_enabled);
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
StateStore* state_store();
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index f64bc83..5938efbd 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -8,7 +8,7 @@
#include "base/compiler_specific.h"
#include "base/observer_list.h"
#include "base/prefs/pref_change_registrar.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/browser/extension_prefs.h"
@@ -21,7 +21,7 @@
// Model for the browser actions toolbar.
class ExtensionToolbarModel : public content::NotificationObserver,
- public BrowserContextKeyedService {
+ public KeyedService {
public:
ExtensionToolbarModel(Profile* profile,
extensions::ExtensionPrefs* extension_prefs);
diff --git a/chrome/browser/extensions/extension_toolbar_model_factory.cc b/chrome/browser/extensions/extension_toolbar_model_factory.cc
index 79ab80f..342fb1d3 100644
--- a/chrome/browser/extensions/extension_toolbar_model_factory.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_factory.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/extensions/extension_toolbar_model.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.h"
#include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -32,9 +32,8 @@
ExtensionToolbarModelFactory::~ExtensionToolbarModelFactory() {}
-BrowserContextKeyedService*
- ExtensionToolbarModelFactory::BuildServiceInstanceFor(
- content::BrowserContext* context) const {
+KeyedService* ExtensionToolbarModelFactory::BuildServiceInstanceFor(
+ content::BrowserContext* context) const {
return new ExtensionToolbarModel(
Profile::FromBrowserContext(context),
extensions::ExtensionPrefsFactory::GetForBrowserContext(context));
diff --git a/chrome/browser/extensions/extension_toolbar_model_factory.h b/chrome/browser/extensions/extension_toolbar_model_factory.h
index 29884be..564f2c2c 100644
--- a/chrome/browser/extensions/extension_toolbar_model_factory.h
+++ b/chrome/browser/extensions/extension_toolbar_model_factory.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.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 ExtensionToolbarModel;
class Profile;
@@ -24,7 +24,7 @@
ExtensionToolbarModelFactory();
virtual ~ExtensionToolbarModelFactory();
- 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/extensions/image_loader.h b/chrome/browser/extensions/image_loader.h
index 2eeae20..79a7e991 100644
--- a/chrome/browser/extensions/image_loader.h
+++ b/chrome/browser/extensions/image_loader.h
@@ -10,7 +10,7 @@
#include "base/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/keyed_service/core/keyed_service.h"
#include "extensions/common/extension_resource.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/layout.h"
@@ -35,7 +35,7 @@
// The views need to load their icons asynchronously might be deleted before
// the images have loaded. If you pass your callback using a weak_ptr, this
// will make sure the callback won't be called after the view is deleted.
-class ImageLoader : public BrowserContextKeyedService {
+class ImageLoader : public KeyedService {
public:
// Information about a singe image representation to load from an extension
// resource.
diff --git a/chrome/browser/extensions/image_loader_factory.cc b/chrome/browser/extensions/image_loader_factory.cc
index 9181670..5ccb75e 100644
--- a/chrome/browser/extensions/image_loader_factory.cc
+++ b/chrome/browser/extensions/image_loader_factory.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/extensions/image_loader_factory.h"
#include "chrome/browser/extensions/image_loader.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 extensions {
@@ -30,7 +30,7 @@
ImageLoaderFactory::~ImageLoaderFactory() {
}
-BrowserContextKeyedService* ImageLoaderFactory::BuildServiceInstanceFor(
+KeyedService* ImageLoaderFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
return new ImageLoader;
}
diff --git a/chrome/browser/extensions/image_loader_factory.h b/chrome/browser/extensions/image_loader_factory.h
index 55828da..41d62dd 100644
--- a/chrome/browser/extensions/image_loader_factory.h
+++ b/chrome/browser/extensions/image_loader_factory.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_EXTENSIONS_IMAGE_LOADER_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"
namespace content {
class BrowserContext;
@@ -33,7 +33,7 @@
virtual ~ImageLoaderFactory();
// 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/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h
index 2f9a880..3997370 100644
--- a/chrome/browser/extensions/install_tracker.h
+++ b/chrome/browser/extensions/install_tracker.h
@@ -8,7 +8,7 @@
#include "base/observer_list.h"
#include "base/prefs/pref_change_registrar.h"
#include "chrome/browser/extensions/install_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"
@@ -18,7 +18,7 @@
class ExtensionPrefs;
-class InstallTracker : public BrowserContextKeyedService,
+class InstallTracker : public KeyedService,
public content::NotificationObserver {
public:
InstallTracker(Profile* profile,
@@ -34,7 +34,7 @@
int percent_downloaded);
void OnInstallFailure(const std::string& extension_id);
- // Overriddes for BrowserContextKeyedService:
+ // Overriddes for KeyedService:
virtual void Shutdown() OVERRIDE;
// content::NotificationObserver
diff --git a/chrome/browser/extensions/install_tracker_factory.cc b/chrome/browser/extensions/install_tracker_factory.cc
index f0bd4a7c..cf0d24b 100644
--- a/chrome/browser/extensions/install_tracker_factory.cc
+++ b/chrome/browser/extensions/install_tracker_factory.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/install_tracker.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.h"
#include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -36,7 +36,7 @@
InstallTrackerFactory::~InstallTrackerFactory() {
}
-BrowserContextKeyedService* InstallTrackerFactory::BuildServiceInstanceFor(
+KeyedService* InstallTrackerFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
return new InstallTracker(profile, ExtensionPrefs::Get(context));
diff --git a/chrome/browser/extensions/install_tracker_factory.h b/chrome/browser/extensions/install_tracker_factory.h
index 938a6aa7..064ba34 100644
--- a/chrome/browser/extensions/install_tracker_factory.h
+++ b/chrome/browser/extensions/install_tracker_factory.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_FACTORY_H_
#define CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_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 T> struct DefaultSingletonTraits;
@@ -27,7 +27,7 @@
virtual ~InstallTrackerFactory();
// BrowserContextKeyedServiceFactory overrides:
- 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/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h
index f609dab..e25e58ac 100644
--- a/chrome/browser/extensions/menu_manager.h
+++ b/chrome/browser/extensions/menu_manager.h
@@ -18,7 +18,7 @@
#include "base/strings/string16.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_icon_manager.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/url_pattern_set.h"
@@ -267,7 +267,7 @@
// This class keeps track of menu items added by extensions.
class MenuManager : public content::NotificationObserver,
public base::SupportsWeakPtr<MenuManager>,
- public BrowserContextKeyedService {
+ public KeyedService {
public:
MenuManager(Profile* profile, StateStore* store_);
virtual ~MenuManager();
diff --git a/chrome/browser/extensions/menu_manager_factory.cc b/chrome/browser/extensions/menu_manager_factory.cc
index a34d7b58..c90d888a 100644
--- a/chrome/browser/extensions/menu_manager_factory.cc
+++ b/chrome/browser/extensions/menu_manager_factory.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/extensions/menu_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"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/extension_system_provider.h"
#include "extensions/browser/extensions_browser_client.h"
@@ -34,9 +34,8 @@
MenuManagerFactory::~MenuManagerFactory() {}
-BrowserContextKeyedService*
- MenuManagerFactory::BuildServiceInstanceFor(
- content::BrowserContext* context) const {
+KeyedService* MenuManagerFactory::BuildServiceInstanceFor(
+ content::BrowserContext* context) const {
Profile* profile = Profile::FromBrowserContext(context);
return new MenuManager(
profile,
diff --git a/chrome/browser/extensions/menu_manager_factory.h b/chrome/browser/extensions/menu_manager_factory.h
index 6811151e..72c64d9 100644
--- a/chrome/browser/extensions/menu_manager_factory.h
+++ b/chrome/browser/extensions/menu_manager_factory.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.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 @@
MenuManagerFactory();
virtual ~MenuManagerFactory();
- 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/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 2cc739f..3204c04 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -498,8 +498,7 @@
DISALLOW_COPY_AND_ASSIGN(MockExtensionSystem);
};
-BrowserContextKeyedService* BuildMockExtensionSystem(
- content::BrowserContext* profile) {
+KeyedService* BuildMockExtensionSystem(content::BrowserContext* profile) {
return new MockExtensionSystem(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.h b/chrome/browser/extensions/signin/gaia_auth_extension_loader.h
index 6c6834e..a0a8df9 100644
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.h
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.h
@@ -34,7 +34,7 @@
private:
friend class BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader>;
- // BrowserContextKeyedService overrides:
+ // KeyedService overrides:
virtual void Shutdown() OVERRIDE;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc
index 43577c00..d70ad57 100644
--- a/chrome/browser/extensions/test_extension_system.cc
+++ b/chrome/browser/extensions/test_extension_system.cc
@@ -183,8 +183,7 @@
}
// static
-BrowserContextKeyedService* TestExtensionSystem::Build(
- content::BrowserContext* profile) {
+KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) {
return new TestExtensionSystem(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h
index 95c9a1f7..6732f680 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -32,7 +32,7 @@
explicit TestExtensionSystem(Profile* profile);
virtual ~TestExtensionSystem();
- // BrowserContextKeyedService implementation.
+ // KeyedService implementation.
virtual void Shutdown() OVERRIDE;
// Creates an ExtensionPrefs with the testing profile and returns it.
@@ -84,7 +84,7 @@
}
// Factory method for tests to use with SetTestingProfile.
- static BrowserContextKeyedService* Build(content::BrowserContext* profile);
+ static KeyedService* Build(content::BrowserContext* profile);
protected:
Profile* profile_;
diff --git a/chrome/browser/extensions/token_cache/token_cache_service.h b/chrome/browser/extensions/token_cache/token_cache_service.h
index 7b7561f8c..dcda111 100644
--- a/chrome/browser/extensions/token_cache/token_cache_service.h
+++ b/chrome/browser/extensions/token_cache/token_cache_service.h
@@ -12,7 +12,7 @@
#include "base/compiler_specific.h"
#include "base/time/time.h"
#include "chrome/browser/signin/signin_manager_base.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/keyed_service/core/keyed_service.h"
class Profile;
@@ -21,7 +21,7 @@
// This class caches tokens for the current user. It will clear tokens out
// when the user logs out or after the specified timeout interval, or when
// the instance of chrome shuts down.
-class TokenCacheService : public BrowserContextKeyedService,
+class TokenCacheService : public KeyedService,
public SigninManagerBase::Observer {
public:
explicit TokenCacheService(Profile* profile);
@@ -38,7 +38,7 @@
// string if the token was not found or timed out.
std::string RetrieveToken(const std::string& token_name);
- // BrowserContextKeyedService:
+ // KeyedService:
virtual void Shutdown() OVERRIDE;
private:
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.cc b/chrome/browser/extensions/token_cache/token_cache_service_factory.cc
index d57c4a6..efde3ac 100644
--- a/chrome/browser/extensions/token_cache/token_cache_service_factory.cc
+++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/extensions/token_cache/token_cache_service.h"
#include "chrome/browser/profiles/profile.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"
// static
extensions::TokenCacheService*
@@ -31,7 +31,7 @@
TokenCacheServiceFactory::~TokenCacheServiceFactory() {
}
-BrowserContextKeyedService* TokenCacheServiceFactory::BuildServiceInstanceFor(
+KeyedService* TokenCacheServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
return new extensions::TokenCacheService(static_cast<Profile*>(profile));
}
diff --git a/chrome/browser/extensions/token_cache/token_cache_service_factory.h b/chrome/browser/extensions/token_cache/token_cache_service_factory.h
index 3767fe3..14eff8c 100644
--- a/chrome/browser/extensions/token_cache/token_cache_service_factory.h
+++ b/chrome/browser/extensions/token_cache/token_cache_service_factory.h
@@ -7,7 +7,7 @@
#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;
@@ -27,7 +27,7 @@
friend struct DefaultSingletonTraits<TokenCacheServiceFactory>;
// Inherited from BrowserContextKeyedServiceFactory:
- virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+ virtual KeyedService* BuildServiceInstanceFor(
content::BrowserContext* profile) const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(TokenCacheServiceFactory);
