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

chrome/browser/ui/browser_navigator_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 "chrome/browser/ui/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 50 matching lines @@
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = disposition;
   browser::Navigate(&p);
 
   // Nothing should have happened as a result of Navigate();
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(old_url, browser()->GetSelectedTabContents()->GetURL());
 }
 
-void BrowserNavigatorTest::Observe(NotificationType type,
+void BrowserNavigatorTest::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB: {
+  switch (type) {
+    case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB: {
       ++this->created_tab_contents_count_;
       break;
     }
     default:
       break;
   }
 }
 
 namespace {
 
@@ skipping 14 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting) {
   GURL url("http://www.google.com/");
   GURL singleton_url1("http://maps.google.com/");
 
   // Register for a notification if an additional tab_contents was instantiated.
   // Opening a Singleton tab that is already opened should not be opening a new
   // tab nor be creating a new TabContents object
   NotificationRegistrar registrar;
 
   // As the registrar object goes out of scope, this will get unregistered
-  registrar.Add(this, NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB,
+  registrar.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                 NotificationService::AllSources());
 
   browser()->AddSelectedTabWithURL(singleton_url1, PageTransition::LINK);
   browser()->AddSelectedTabWithURL(url, PageTransition::LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->active_index());
 
   unsigned int previous_tab_contents_count =
@@ skipping 861 matching lines @@
   ui_test_utils::WaitForNavigationInCurrentTab(browser());
 
   browser()->OpenOptionsDialog();
   ui_test_utils::WaitForNavigationInCurrentTab(browser());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL("chrome://settings/browser"),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 }  // namespace