Change ProfileKeyedAPIFactory to build instances with BrowserContext instead of Profile.

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/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;
@@ skipping 34 matching lines @@
   //   }
 };
 
 // A template for factories for BrowserContextKeyedServices that manage
 // extension APIs. T is a BrowserContextKeyedService that uses this factory
 // template instead of its own separate factory definition to manage its
 // per-profile instances.
 template <typename T>
 class ProfileKeyedAPIFactory : public BrowserContextKeyedServiceFactory {
  public:
-  // TODO(yoz): Delete this one.
-  static T* GetForProfile(Profile* profile) {
+  // TODO(yoz): Rename to Get().
+  static T* GetForProfile(content::BrowserContext* context) {
     return static_cast<T*>(
-        T::GetFactoryInstance()->GetServiceForBrowserContext(profile, true));
-  }
-
-  static T* GetForProfile(content::BrowserContext* context) {
-    return static_cast<T*>(T::GetFactoryInstance()->GetServiceForBrowserContext(
-        Profile::FromBrowserContext(context), true));
+        T::GetFactoryInstance()->GetServiceForBrowserContext(context, 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(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   //     DependsOn(ProfileSyncServiceFactory::GetInstance());
   // }
   void DeclareFactoryDependencies() {
     DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   }
 
   ProfileKeyedAPIFactory()
       : BrowserContextKeyedServiceFactory(
           T::service_name(),
           BrowserContextDependencyManager::GetInstance()) {
     DeclareFactoryDependencies();
   }
 
   virtual ~ProfileKeyedAPIFactory() {
   }
 
  private:
   // BrowserContextKeyedServiceFactory implementation.
   virtual BrowserContextKeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE {
-    return new T(static_cast<Profile*>(profile));
+      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 chrome::GetBrowserContextRedirectedInIncognito(context);
+      return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
 
     if (T::kServiceHasOwnInstanceInIncognito)
-      return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+      return context;
 
     return BrowserContextKeyedServiceFactory::GetBrowserContextToUse(context);
   }
 
   virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE {
     return T::kServiceIsCreatedWithBrowserContext;
   }
 
   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_