Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/extensions/extension_sync_service_factory.cc b/src/chrome/browser/extensions/extension_sync_service_factory.cc
index 5b9b9a4..e72a58d 100644 (file)
--- a/src/chrome/browser/extensions/extension_sync_service_factory.cc
+++ b/src/chrome/browser/extensions/extension_sync_service_factory.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/extensions/extension_sync_service_factory.h"
 
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/extensions/extension_prefs_factory.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
-#include "chrome/browser/extensions/extension_system.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_prefs_factory.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extensions_browser_client.h"
 
 // static
 ExtensionSyncService* ExtensionSyncServiceFactory::GetForProfile(
@@ -41,12 +41,12 @@ BrowserContextKeyedService*
   Profile* profile = Profile::FromBrowserContext(context);
   return new ExtensionSyncService(
       profile,
-      extensions::ExtensionPrefsFactory::GetForProfile(profile),
-      extensions::ExtensionSystemFactory::GetForProfile(profile)->
-          extension_service());
+      extensions::ExtensionPrefsFactory::GetForBrowserContext(context),
+      extensions::ExtensionSystem::Get(profile)->extension_service());
 }
 
 content::BrowserContext* ExtensionSyncServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return chrome::GetBrowserContextRedirectedInIncognito(context);
+  return extensions::ExtensionsBrowserClient::Get()->
+      GetOriginalContext(context);
 }