Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_loader_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 #define EXPECT_STR_EQ(ascii, utf16) \
   EXPECT_EQ(ASCIIToWide(ascii), UTF16ToWide(utf16))
 
@@ skipping 11 matching lines @@
   }
 
   void SetupInstantProvider(const std::string& page) {
     TemplateURLService* model =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     ASSERT_TRUE(model);
 
     if (!model->loaded()) {
       model->Load();
       ui_test_utils::WaitForNotification(
-          NotificationType::TEMPLATE_URL_SERVICE_LOADED);
+          chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
     }
 
     ASSERT_TRUE(model->loaded());
 
     // TemplateURLService takes ownership of this.
     TemplateURL* template_url = new TemplateURL();
 
     std::string url = StringPrintf(
         "http://%s:%d/files/instant/%s?q={searchTerms}",
         test_server()->host_port_pair().host().c_str(),
@@ skipping 51 matching lines @@
     // When the page loads, the initial searchBox values are set and only a
     // resize will have been sent.
     ASSERT_EQ("true 0 0 0 1 d false d false 1 1",
               GetSearchStateAsString(preview_, false));
   }
 
   void SetLocationBarText(const std::string& text) {
     ASSERT_NO_FATAL_FAILURE(FindLocationBar());
     location_bar_->location_entry()->SetUserText(UTF8ToUTF16(text));
     ui_test_utils::WaitForNotification(
-        NotificationType::INSTANT_CONTROLLER_SHOWN);
+        chrome::NOTIFICATION_INSTANT_CONTROLLER_SHOWN);
   }
 
   const string16& GetSuggestion() const {
     return browser()->instant()->loader_manager_->
         current_loader()->complete_suggested_text_;
   }
 
   void SendKey(ui::KeyboardCode key) {
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), key, false, false, false, false));
@@ skipping 455 matching lines @@
   // results.
   EXPECT_TRUE(browser()->instant()->IsShowingInstant());
   // But because we're waiting to determine if the page really supports instant
   // we shouldn't be showing the preview.
   EXPECT_FALSE(browser()->instant()->is_displayable());
   // But instant should still be active.
   EXPECT_TRUE(browser()->instant()->is_active());
 
   // When the response comes back that the page doesn't support instant the tab
   // should be closed.
-  ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
+  ui_test_utils::WaitForNotification(content::NOTIFICATION_TAB_CLOSED);
   EXPECT_FALSE(browser()->instant()->IsShowingInstant());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_TRUE(browser()->instant()->is_active());
   EXPECT_FALSE(browser()->instant()->IsCurrent());
 }
 
 // Verifies transitioning from loading a non-search string to a search string
 // with the provider not supporting instant works (meaning we don't display
 // anything).
 #if defined(OS_MACOSX) || defined(OS_LINUX)
@@ skipping 29 matching lines @@
   ASSERT_TRUE(browser()->instant()->is_displayable());
   ASSERT_TRUE(browser()->instant()->is_active());
   // Because we typed in a search string we should think we're showing instant
   // results.
   EXPECT_TRUE(browser()->instant()->MightSupportInstant());
   // Instant should not be current (it's still loading).
   EXPECT_FALSE(browser()->instant()->IsCurrent());
 
   // When the response comes back that the page doesn't support instant the tab
   // should be closed.
-  ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
+  ui_test_utils::WaitForNotification(content::NOTIFICATION_TAB_CLOSED);
   EXPECT_FALSE(browser()->instant()->IsShowingInstant());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   // But because the omnibox is still open, instant should be active.
   ASSERT_TRUE(browser()->instant()->is_active());
 }
 
 // Verifies the page was told a non-zero height.
 // DISABLED http://crbug.com/80118
 #if defined(OS_LINUX)
 IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_ValidHeight) {
@@ skipping 35 matching lines @@
   EnableInstant();
   GURL url(test_server()->GetURL("files/instant/403.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
   // The preview shouldn't be showing, but it should be loading.
   ASSERT_TRUE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 
   // When instant sees the 403, it should close the tab.
-  ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
+  ui_test_utils::WaitForNotification(content::NOTIFICATION_TAB_CLOSED);
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 
   // Try loading another url on the server. Instant shouldn't create a new tab
   // as the server returned 403.
   GURL url2(test_server()->GetURL("files/instant/empty.html"));
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url2.spec()));
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
@@ skipping 143 matching lines @@
 IN_PROC_BROWSER_TEST_F(InstantTest, DontCrashOnBlockedJS) {
 #endif  // OS_LINUX
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   // Wait for notification that the instant API has been determined.
   ui_test_utils::WaitForNotification(
-      NotificationType::INSTANT_SUPPORT_DETERMINED);
+      chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED);
   // As long as we get the notification we're good (the renderer didn't crash).
 }
 
 // DISABLED http://crbug.com/80118
 #if defined(OS_LINUX)
 IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_DownloadOnEnter) {
 #else
 IN_PROC_BROWSER_TEST_F(InstantTest, DownloadOnEnter) {
 #endif  // OS_LINUX
   ASSERT_TRUE(test_server()->Start());
   EnableInstant();
   // Make sure the browser window is the front most window.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
   printf("0\n");
   ASSERT_NO_FATAL_FAILURE(WaitForPreviewToNavigate(true));
   url = test_server()->GetURL("files/instant/download.zip");
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
   // Wait for the load to fail (because instant disables downloads).
   printf("1\n");
   ui_test_utils::WaitForNotification(
-      NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR);
+      content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR);
 
   printf("2\n");
   ui_test_utils::WindowedNotificationObserver download_observer(
-      NotificationType::DOWNLOAD_INITIATED,
+      chrome::NOTIFICATION_DOWNLOAD_INITIATED,
       NotificationService::AllSources());
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN));
   printf("3\n");
   download_observer.Wait();
   printf("4\n");
 
   // And we should end up at about:blank.
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
   EXPECT_EQ("about:blank",
@@ skipping 34 matching lines @@
   ui_test_utils::NavigateToURL(
       browser(),
       GURL(test_server()->GetURL("files/instant/empty.html")));
   bool result;
   ASSERT_TRUE(GetBoolFromJavascript(
                   browser()->GetSelectedTabContents(),
                   "window.chrome.searchBox.value.length == 0",
                   &result));
   EXPECT_TRUE(result);
 }