Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/extensions/chrome_app_api_browsertest.cc b/src/chrome/browser/extensions/chrome_app_api_browsertest.cc
index 86428bf..13e37c6 100644 (file)
--- a/src/chrome/browser/extensions/chrome_app_api_browsertest.cc
+++ b/src/chrome/browser/extensions/chrome_app_api_browsertest.cc
@@ -286,15 +286,17 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) {
   EXPECT_TRUE(IsAppInstalledInMainFrame());
 
   // Disable the extension and verify the state.
-  browser()->profile()->GetExtensionService()->DisableExtension(
-      extension->id(), Extension::DISABLE_PERMISSIONS_INCREASE);
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service();
+  service->DisableExtension(extension->id(),
+                            Extension::DISABLE_PERMISSIONS_INCREASE);
   ui_test_utils::NavigateToURL(browser(), app_url);
 
   EXPECT_EQ("disabled", InstallStateInMainFrame());
   EXPECT_EQ("cannot_run", RunningStateInMainFrame());
   EXPECT_FALSE(IsAppInstalledInMainFrame());
 
-  browser()->profile()->GetExtensionService()->EnableExtension(extension->id());
+  service->EnableExtension(extension->id());
   EXPECT_EQ("installed", InstallStateInMainFrame());
   EXPECT_EQ("ready_to_run", RunningStateInMainFrame());
   EXPECT_FALSE(IsAppInstalledInMainFrame());
@@ -309,7 +311,6 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) {
   EXPECT_EQ("installed", InstallStateInIFrame());
   EXPECT_EQ("cannot_run", RunningStateInIFrame());
   EXPECT_FALSE(IsAppInstalledInIFrame());
-
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningStateFrame) {