Change GetProfileToUse method from Profile to content::BrowserContext

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 "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 namespace extensions {
 
 template <typename T>
 class ProfileKeyedAPIFactory;
 
@@ skipping 68 matching lines @@
 
  private:
   // ProfileKeyedServiceFactory implementation.
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const OVERRIDE {
     return new T(static_cast<Profile*>(profile));
   }
 
   // ProfileKeyedBaseFactory implementation.
   // These can be effectively overridden with template specializations.
-  virtual bool ServiceRedirectedInIncognito() const OVERRIDE {
-    return T::kServiceRedirectedInIncognito;
+  virtual content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const OVERRIDE {
+    if (T::kServiceRedirectedInIncognito)
+      return chrome::GetBrowserContextRedirectedInIncognito(context);
+
+    if (T::kServiceHasOwnInstanceInIncognito)
+      return chrome::GetBrowserContextOwnInstanceInIncognito(context);
+
+    return ProfileKeyedServiceFactory::GetBrowserContextToUse(context);
   }
 
   virtual bool ServiceIsCreatedWithProfile() const OVERRIDE {
     return true;
   }
 
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE {
     return T::kServiceIsNULLWhileTesting;
   }
 
-  virtual bool ServiceHasOwnInstanceInIncognito() const OVERRIDE {
-    return T::kServiceHasOwnInstanceInIncognito;
-  }
-
   DISALLOW_COPY_AND_ASSIGN(ProfileKeyedAPIFactory);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_PROFILE_KEYED_API_FACTORY_H_