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

chrome/browser/instant/instant_browsertest.cc

Index: chrome/browser/instant/instant_browsertest.cc
===================================================================
--- chrome/browser/instant/instant_browsertest.cc	(revision 91968)
+++ chrome/browser/instant/instant_browsertest.cc	(working copy)
@@ -20,6 +20,7 @@
 #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"
@@ -51,7 +52,7 @@
     if (!model->loaded()) {
       model->Load();
       ui_test_utils::WaitForNotification(
-          NotificationType::TEMPLATE_URL_SERVICE_LOADED);
+          chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
     }
 
     ASSERT_TRUE(model->loaded());
@@ -123,7 +124,7 @@
     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 {
@@ -599,7 +600,7 @@
 
   // 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());
@@ -649,7 +650,7 @@
 
   // 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.
@@ -705,7 +706,7 @@
   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());
@@ -869,7 +870,7 @@
   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).
 }
 
@@ -894,11 +895,11 @@
   // 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");