Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/extensions/convert_web_app_browsertest.cc b/src/chrome/browser/extensions/convert_web_app_browsertest.cc
index b53893e..1c3cc72 100644 (file)
--- a/src/chrome/browser/extensions/convert_web_app_browsertest.cc
+++ b/src/chrome/browser/extensions/convert_web_app_browsertest.cc
@@ -5,7 +5,6 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -21,6 +20,8 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
@@ -43,7 +44,8 @@ class ExtensionFromWebAppTest
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
-    if (type == chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED) {
+    if (type ==
+        extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED) {
       const Extension* extension =
           content::Details<const InstalledExtensionInfo>(details)->extension;
       if (extension->id() == expected_extension_id_) {
@@ -62,12 +64,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, DISABLED_Basic) {
     return;
 #endif
 
-  browser()->profile()->GetExtensionService()->set_show_extensions_prompts(
-      false);
+  ExtensionService* service =
+      ExtensionSystem::Get(browser()->profile())->extension_service();
+  service->set_show_extensions_prompts(false);
 
   content::NotificationRegistrar registrar;
   registrar.Add(this,
-                chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
+                extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
                 content::NotificationService::AllSources());
 
   expected_extension_id_ = "ffnmbohohhobhkjpfbefbjifapgcmpaa";