ExtensionSystem cleanup part 3

chrome/browser/extensions/api/profile_keyed_api_factory.h

 // Copyright (c) 2012 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 CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_
 #define CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_
 
-#include "chrome/browser/extensions/extension_system_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/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
+#include "extensions/browser/extension_system_provider.h"
+#include "extensions/browser/extensions_browser_client.h"
 
 namespace extensions {
 
 template <typename T>
 class ProfileKeyedAPIFactory;
 
 // Instantiations of ProfileKeyedAPIFactory 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 ProfileKeyedAPIFactory for the service.
@@ skipping 41 matching lines @@
         T::GetFactoryInstance()->GetServiceForBrowserContext(profile, true));
   }
 
   // Declare dependencies on other factories.
   // By default, ExtensionSystemFactory is the only dependency; however,
   // specializations can override this. Declare your specialization in
   // your header file after the ProfileKeyedAPI class definition.
   // Then in the cc file (or inline in the header), define it, e.g.:
   //   template <>
   //   ProfileKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() {
-  //     DependsOn(ExtensionSystemFactory::GetInstance());
+  //     DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   //     DependsOn(ProfileSyncServiceFactory::GetInstance());
   // }
   void DeclareFactoryDependencies() {
-    DependsOn(ExtensionSystemFactory::GetInstance());
+    DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   }
 
   ProfileKeyedAPIFactory()
       : BrowserContextKeyedServiceFactory(
           T::service_name(),
           BrowserContextDependencyManager::GetInstance()) {
     DeclareFactoryDependencies();
   }
 
   virtual ~ProfileKeyedAPIFactory() {
@@ skipping 26 matching lines @@
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE {
     return T::kServiceIsNULLWhileTesting;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ProfileKeyedAPIFactory);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_