Change GetProfileToUse method from Profile to content::BrowserContext

chrome/browser/extensions/extension_action_manager.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_action_manager.h"
 
 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager.h"
 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_system.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_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/api/extension_action/script_badge_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 20 matching lines @@
   ExtensionActionManagerFactory()
       : ProfileKeyedServiceFactory("ExtensionActionManager",
                                    ProfileDependencyManager::GetInstance()) {
   }
 
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const OVERRIDE {
     return new ExtensionActionManager(static_cast<Profile*>(profile));
   }
 
-  virtual bool ServiceRedirectedInIncognito() const OVERRIDE {
-    return true;
+  virtual content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const OVERRIDE {
+    return chrome::GetBrowserContextRedirectedInIncognito(context);
   }
 };
 
 ExtensionActionManagerFactory*
 ExtensionActionManagerFactory::GetInstance() {
   return Singleton<ExtensionActionManagerFactory>::get();
 }
 
 }  // namespace
 
@@ skipping 96 matching lines @@
 }
 
 ExtensionAction* ExtensionActionManager::GetScriptBadge(
     const extensions::Extension& extension) const {
   return GetOrCreateOrNull(&script_badges_, extension.id(),
                            ActionInfo::TYPE_SCRIPT_BADGE,
                            ActionInfo::GetScriptBadgeInfo(&extension));
 }
 
 }  // namespace extensions