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

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc	(revision 147577)
+++ chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc	(working copy)
@@ -320,9 +320,9 @@
 
   void WaitForInterstitial() {
     WebContents* contents = chrome::GetActiveWebContents(browser());
-    ui_test_utils::WindowedNotificationObserver interstitial_observer(
-          content::NOTIFICATION_INTERSTITIAL_ATTACHED,
-          content::Source<WebContents>(contents));
+    content::WindowedNotificationObserver interstitial_observer(
+        content::NOTIFICATION_INTERSTITIAL_ATTACHED,
+        content::Source<WebContents>(contents));
     if (!InterstitialPage::GetInterstitialPage(contents))
       interstitial_observer.Wait();
   }
@@ -455,7 +455,7 @@
   // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
   // event that clears the interstitial.  We wait for DidNavigate instead.
   ui_test_utils::NavigateToURL(browser(), url);
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
@@ -486,7 +486,7 @@
 
   // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
   // event that clears the interstitial.  We wait for DidNavigate instead.
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
@@ -504,7 +504,7 @@
 
   // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
   // event that clears the interstitial.  We wait for DidNavigate instead.
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
@@ -527,7 +527,7 @@
 
   // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
   // event that clears the interstitial.  We wait for DidNavigate instead.
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));
@@ -548,7 +548,7 @@
 
   ui_test_utils::NavigateToURL(browser(), url);
 
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(browser())->GetController()));