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

chrome/browser/fast_shutdown_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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 69 matching lines @@
 // Flaky on all platforms, http://crbug.com/89173
 #if !defined(OS_CHROMEOS)  // ChromeOS opens tabs instead of windows for popups.
 IN_PROC_BROWSER_TEST_F(FastShutdown, SlowTermination) {
   // Need to run these tests on http:// since we only allow cookies on that (and
   // https obviously).
   ASSERT_TRUE(test_server()->Start());
   // This page has an unload handler.
   GURL url = test_server()->GetURL("files/fast_shutdown/on_unloader.html");
   EXPECT_EQ("", GetCookies(url));
 
-  ui_test_utils::WindowedNotificationObserver window_observer(
-        chrome::NOTIFICATION_BROWSER_WINDOW_READY,
-        content::NotificationService::AllSources());
+  content::WindowedNotificationObserver window_observer(
+      chrome::NOTIFICATION_BROWSER_WINDOW_READY,
+      content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
   window_observer.Wait();
 
   // Close the new window, removing the one and only beforeunload handler.
   ASSERT_EQ(2u, BrowserList::size());
   BrowserList::const_iterator i = BrowserList::begin();
   ++i;
   chrome::CloseWindow(*i);
 
   // Need to wait for the renderer process to shutdown to ensure that we got the
   // set cookies IPC.
-  ui_test_utils::WindowedNotificationObserver renderer_shutdown_observer(
-        content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-        content::NotificationService::AllSources());
+  content::WindowedNotificationObserver renderer_shutdown_observer(
+      content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
+      content::NotificationService::AllSources());
   // Close the tab. This should launch the unload handler, which sets a cookie
   // that's stored to disk.
   chrome::CloseTab(browser());
   renderer_shutdown_observer.Wait();
 
   
   EXPECT_EQ("unloaded=ohyeah", GetCookies(url));
 }
 #endif