Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / infobars / infobars_browsertest.cc

diff --git a/src/chrome/browser/infobars/infobars_browsertest.cc b/src/chrome/browser/infobars/infobars_browsertest.cc
index aa68737..7465ce5 100644 (file)
--- a/src/chrome/browser/infobars/infobars_browsertest.cc
+++ b/src/chrome/browser/infobars/infobars_browsertest.cc
@@ -17,7 +17,6 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/ui/ui_test.h"
 #include "content/public/browser/notification_service.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
@@ -38,7 +37,7 @@ class InfoBarsTest : public InProcessBrowserTest {
     ExtensionService* service = profile->GetExtensionService();
 
     content::WindowedNotificationObserver observer(
-        chrome::NOTIFICATION_EXTENSION_LOADED,
+        chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
         content::NotificationService::AllSources());
 
     scoped_ptr<ExtensionInstallPrompt> client(new ExtensionInstallPrompt(
@@ -82,9 +81,10 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   InstallExtension("theme2.crx");
   infobar_added_2.Wait();
   infobar_removed_1.Wait();
-  EXPECT_EQ(0u,
-            InfoBarService::FromWebContents(browser()->tab_strip_model()->
-                GetWebContentsAt(0))->infobar_count());
+  EXPECT_EQ(
+      0u,
+      InfoBarService::FromWebContents(
+          browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());
 
   content::WindowedNotificationObserver infobar_removed_2(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
@@ -92,6 +92,7 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();
   infobar_removed_2.Wait();
   EXPECT_EQ(0u,
-            InfoBarService::FromWebContents(browser()->tab_strip_model()->
-                GetActiveWebContents())->infobar_count());
+            InfoBarService::FromWebContents(
+                browser()->tab_strip_model()->GetActiveWebContents())->
+                infobar_count());
 }