Move extensions-related files to using //components/keyed_service.

extensions/browser/browser_context_keyed_api_factory.h

Index: extensions/browser/browser_context_keyed_api_factory.h
diff --git a/extensions/browser/browser_context_keyed_api_factory.h b/extensions/browser/browser_context_keyed_api_factory.h
index cfe26bf5526a1ce4054b15ad5f8c52fed0b554f4..97e9663e305469e282447ae1cad98817674aa798 100644
--- a/extensions/browser/browser_context_keyed_api_factory.h
+++ b/extensions/browser/browser_context_keyed_api_factory.h
@@ -5,9 +5,9 @@
 #ifndef EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_API_FACTORY_H_
 #define EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_API_FACTORY_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/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 "components/keyed_service/core/keyed_service.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 
@@ -20,7 +20,7 @@ class BrowserContextKeyedAPIFactory;
 // and also define a static const char* service_name() function (used in the
 // BrowserContextKeyedBaseFactory constructor). These fields should
 // be accessible to the BrowserContextKeyedAPIFactory for the service.
-class BrowserContextKeyedAPI : public BrowserContextKeyedService {
+class BrowserContextKeyedAPI : public KeyedService {
  protected:
   // Defaults for flags that control BrowserContextKeyedAPIFactory behavior.
   // These can be overridden by subclasses to change that behavior.
@@ -66,7 +66,7 @@ class BrowserContextKeyedAPI : public BrowserContextKeyedService {
 };
 
 // A template for factories for BrowserContextKeyedServices that manage

[Yoyo Zhou, 2014/03/12 18:30:57]

Should all these references be to KeyedService now?

[blundell, 2014/03/12 20:12:50]

Yep, my mffr.py input didn't account for the plural :). Thanks! Done.

On 2014/03/12 18:30:57, Yoyo Zhou wrote:

-// extension APIs. T is a BrowserContextKeyedService that uses this factory
+// extension APIs. T is a KeyedService that uses this factory
 // template instead of its own separate factory definition to manage its
 // per-profile instances.
 template <typename T>
@@ -103,7 +103,7 @@ class BrowserContextKeyedAPIFactory : public BrowserContextKeyedServiceFactory {
 
  private:
   // BrowserContextKeyedServiceFactory implementation.
-  virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+  virtual KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const OVERRIDE {
     return new T(context);
   }