Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows…

chrome/browser/sessions/session_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/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 70 matching lines @@
   // correspond to the given URLs.
   void VerifyNavigationEntries(
       content::NavigationController& controller, GURL url1, GURL url2) {
     ASSERT_EQ(2, controller.GetEntryCount());
     EXPECT_EQ(1, controller.GetCurrentEntryIndex());
     EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL());
     EXPECT_EQ(url2, controller.GetEntryAtIndex(1)->GetURL());
   }
 
   void CloseBrowserSynchronously(Browser* browser) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
     browser->window()->Close();
 #if defined(OS_MACOSX)
     // BrowserWindowController depends on the auto release pool being recycled
     // in the message loop to delete itself, which frees the Browser object
     // which fires this event.
     AutoreleasePool()->Recycle();
 #endif
     observer.Wait();
@@ skipping 12 matching lines @@
         content::NotificationService::AllSources(), NULL, expected_tab_count);
     chrome::NewEmptyWindow(profile);
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
     navigation_observer.Wait();
     g_browser_process->ReleaseModule();
 
     return new_browser;
   }
 
   void GoBack(Browser* browser) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::GoBack(browser, CURRENT_TAB);
     observer.Wait();
   }
 
   void GoForward(Browser* browser) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::GoForward(browser, CURRENT_TAB);
     observer.Wait();
   }
 
   void AssertOneWindowWithOneTab(Browser* browser) {
     ASSERT_EQ(1u, BrowserList::size());
     ASSERT_EQ(1, browser->tab_count());
   }
@@ skipping 113 matching lines @@
   GURL url2(ui_test_utils::GetTestUrl(
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title2.html"))));
   GURL url3(ui_test_utils::GetTestUrl(
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title3.html"))));
 
   // Add and navigate three tabs.
   ui_test_utils::NavigateToURL(browser(), url1);
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::AddSelectedTabWithURL(browser(), url2,
                                   content::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::AddSelectedTabWithURL(browser(), url3,
                                   content::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
 
   TabRestoreService* service =
       TabRestoreServiceFactory::GetForProfile(browser()->profile());
   service->ClearEntries();
@@ skipping 102 matching lines @@
   tab.tab_visual_index = 0;
   tab.current_navigation_index = 1;
   tab.pinned = false;
   tab.navigations.push_back(nav1);
   tab.navigations.push_back(nav2);
 
   ASSERT_EQ(1, browser()->tab_count());
 
   // Restore in the current tab.
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     SessionRestore::RestoreForeignSessionTab(
         chrome::GetActiveWebContents(browser()), tab, CURRENT_TAB);
     observer.Wait();
   }
   ASSERT_EQ(1, browser()->tab_count());
   VerifyNavigationEntries(
       chrome::GetWebContentsAt(browser(), 0)->GetController(), url1, url2);
 
   // Restore in a new tab.
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     SessionRestore::RestoreForeignSessionTab(
         chrome::GetActiveWebContents(browser()), tab, NEW_BACKGROUND_TAB);
     observer.Wait();
   }
   ASSERT_EQ(2, browser()->tab_count());
   ASSERT_EQ(0, browser()->active_index());
   VerifyNavigationEntries(
       chrome::GetWebContentsAt(browser(), 1)->GetController(), url1, url2);
@@ skipping 359 matching lines @@
   ASSERT_EQ(1u, BrowserList::size());
   ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL());
   const content::NavigationController& new_controller =
       chrome::GetActiveWebContents(new_browser)->GetController();
   ASSERT_TRUE(new_controller.GetSessionStorageNamespace());
   std::string restored_session_storage_persistent_id =
       new_controller.GetSessionStorageNamespace()->persistent_id();
   EXPECT_EQ(session_storage_persistent_id,
             restored_session_storage_persistent_id);
 }