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

extensions/browser/browser_context_keyed_api_factory.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace extensions {
 
 template <typename T>
 class BrowserContextKeyedAPIFactory;
 
 // Instantiations of BrowserContextKeyedAPIFactory should use this base class
 // 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.
   // See BrowserContextKeyedBaseFactory for usage.
 
   // These flags affect what instance is returned when Get() is called
   // on an incognito profile. By default, it returns NULL. If
   // kServiceRedirectedInIncognito is true, it returns the instance for the
   // corresponding regular profile. If kServiceHasOwnInstanceInIncognito
   // is true, it returns a separate instance.
@@ skipping 24 matching lines @@
   //   static base::LazyInstance<BrowserContextKeyedAPIFactory<HistoryAPI> >
   //   g_factory = LAZY_INSTANCE_INITIALIZER;
   //
   //   // static
   //   BrowserContextKeyedAPIFactory<HistoryAPI>*
   //   HistoryAPI::GetFactoryInstance() {
   //     return g_factory.Pointer();
   //   }
 };
 
 // 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>
 class BrowserContextKeyedAPIFactory : public BrowserContextKeyedServiceFactory {
  public:
   static T* Get(content::BrowserContext* context) {
     return static_cast<T*>(
         T::GetFactoryInstance()->GetServiceForBrowserContext(context, true));
   }
 
@@ skipping 16 matching lines @@
       : BrowserContextKeyedServiceFactory(
             T::service_name(),
             BrowserContextDependencyManager::GetInstance()) {
     DeclareFactoryDependencies();
   }
 
   virtual ~BrowserContextKeyedAPIFactory() {}
 
  private:
   // BrowserContextKeyedServiceFactory implementation.
-  virtual BrowserContextKeyedService* BuildServiceInstanceFor(
+  virtual KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const OVERRIDE {
     return new T(context);
   }
 
   // BrowserContextKeyedBaseFactory implementation.
   // These can be effectively overridden with template specializations.
   virtual content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const OVERRIDE {
     if (T::kServiceRedirectedInIncognito)
       return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
@@ skipping 11 matching lines @@
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE {
     return T::kServiceIsNULLWhileTesting;
   }
 
   DISALLOW_COPY_AND_ASSIGN(BrowserContextKeyedAPIFactory);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_BROWSER_CONTEXT_KEYED_API_FACTORY_H_