Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / menu_manager_factory.cc

diff --git a/src/chrome/browser/extensions/menu_manager_factory.cc b/src/chrome/browser/extensions/menu_manager_factory.cc
index 39e013b..a34d7b5 100644 (file)
--- a/src/chrome/browser/extensions/menu_manager_factory.cc
+++ b/src/chrome/browser/extensions/menu_manager_factory.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/browser/extensions/menu_manager_factory.h"
 
-#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/menu_manager.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 "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_system_provider.h"
+#include "extensions/browser/extensions_browser_client.h"
 
 namespace extensions {
 
@@ -29,7 +29,7 @@ MenuManagerFactory::MenuManagerFactory()
     : BrowserContextKeyedServiceFactory(
         "MenuManager",
         BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ExtensionSystemFactory::GetInstance());
+  DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 }
 
 MenuManagerFactory::~MenuManagerFactory() {}
@@ -45,7 +45,7 @@ BrowserContextKeyedService*
 
 content::BrowserContext* MenuManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return chrome::GetBrowserContextRedirectedInIncognito(context);
+  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
 }
 
 bool MenuManagerFactory::ServiceIsCreatedWithBrowserContext() const {