Move notifications used only in chrome/ out of content/.

chrome/browser/tab_restore_browsertest.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 46 matching lines @@
           ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
     }
     int tab_count = browser->tab_count();
     EXPECT_EQ(starting_tab_count + how_many, tab_count);
     return tab_count;
   }
 
   void CloseTab(int index) {
     content::WebContents* new_tab = browser()->GetWebContentsAt(index);
     ui_test_utils::WindowedNotificationObserver tab_close_observer(
-          content::NOTIFICATION_TAB_CLOSED,
+          content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
           content::NotificationService::AllSources());
     browser()->CloseTabContents(new_tab);
     tab_close_observer.Wait();
   }
 
   // Uses the undo-close-tab accelerator to undo a close-tab or close-window
   // operation. The newly restored tab is expected to appear in the
   // window at index |expected_window_index|, at the |expected_tabstrip_index|,
   // and to be active. If |expected_window_index| is equal to the number of
   // current windows, the restored tab is expected to be created in a new
   // window (since the index is 0-based).
   void RestoreTab(int expected_window_index,
                   int expected_tabstrip_index) {
     int window_count = static_cast<int>(BrowserList::size());
     ASSERT_GT(window_count, 0);
 
     bool expect_new_window = (expected_window_index == window_count);
 
     Browser* browser;
     if (expect_new_window) {
       browser = *(BrowserList::begin());
     } else {
       browser = GetBrowser(expected_window_index);
     }
     int tab_count = browser->tab_count();
     ASSERT_GT(tab_count, 0);
 
     // Restore the tab.
     ui_test_utils::WindowedNotificationObserver tab_added_observer(
-      content::NOTIFICATION_TAB_PARENTED,
+      chrome::NOTIFICATION_TAB_PARENTED,
       content::NotificationService::AllSources());
     ui_test_utils::WindowedNotificationObserver tab_loaded_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
     browser->RestoreTab();
     tab_added_observer.Wait();
     tab_loaded_observer.Wait();
 
     if (expect_new_window) {
       int new_window_count = static_cast<int>(BrowserList::size());
@@ skipping 425 matching lines @@
   TabContentsWrapper* tab = browser()->GetTabContentsWrapperAt(1);
   EnsureTabFinishedRestoring(tab->web_contents());
   ASSERT_EQ(http_url, tab->web_contents()->GetURL());
 
   // Go back, and see if content is as expected.
   GoBack(browser());
   EXPECT_GT(
       ui_test_utils::FindInPage(tab, ASCIIToUTF16("webkit"), true, false, NULL),
       0);
 }