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

Index: chrome/browser/sessions/session_restore_browsertest.cc
===================================================================
--- chrome/browser/sessions/session_restore_browsertest.cc	(revision 147577)
+++ chrome/browser/sessions/session_restore_browsertest.cc	(working copy)
@@ -88,7 +88,7 @@
   }
 
   void CloseBrowserSynchronously(Browser* browser) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::NotificationService::AllSources());
     browser->window()->Close();
@@ -121,7 +121,7 @@
   }
 
   void GoBack(Browser* browser) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::GoBack(browser, CURRENT_TAB);
@@ -129,7 +129,7 @@
   }
 
   void GoForward(Browser* browser) {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::GoForward(browser, CURRENT_TAB);
@@ -263,7 +263,7 @@
   // 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,
@@ -271,7 +271,7 @@
     observer.Wait();
   }
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::AddSelectedTabWithURL(browser(), url3,
@@ -394,7 +394,7 @@
 
   // Restore in the current tab.
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     SessionRestore::RestoreForeignSessionTab(
@@ -407,7 +407,7 @@
 
   // Restore in a new tab.
   {
-    ui_test_utils::WindowedNotificationObserver observer(
+    content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     SessionRestore::RestoreForeignSessionTab(