Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / ephemeral_app_service_factory.cc

diff --git a/src/chrome/browser/apps/ephemeral_app_service_factory.cc b/src/chrome/browser/apps/ephemeral_app_service_factory.cc
index b99cc27..d7f3206 100644 (file)
--- a/src/chrome/browser/apps/ephemeral_app_service_factory.cc
+++ b/src/chrome/browser/apps/ephemeral_app_service_factory.cc
@@ -5,12 +5,12 @@
 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
 
 #include "chrome/browser/apps/ephemeral_app_service.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 "extensions/browser/extension_system_provider.h"
+#include "extensions/browser/extensions_browser_client.h"
 
-using extensions::ExtensionSystemFactory;
+using extensions::ExtensionsBrowserClient;
 
 // static
 EphemeralAppService*
@@ -28,7 +28,7 @@ EphemeralAppServiceFactory::EphemeralAppServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "EphemeralAppService",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ExtensionSystemFactory::GetInstance());
+  DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 }
 
 EphemeralAppServiceFactory::~EphemeralAppServiceFactory() {
@@ -41,7 +41,7 @@ BrowserContextKeyedService* EphemeralAppServiceFactory::BuildServiceInstanceFor(
 
 content::BrowserContext* EphemeralAppServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return chrome::GetBrowserContextRedirectedInIncognito(context);
+  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
 }
 
 bool EphemeralAppServiceFactory::ServiceIsCreatedWithBrowserContext() const {