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

chrome/browser/extensions/platform_app_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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
@@ skipping 288 matching lines @@
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, GetDisplayPath) {
   SetCommandLineArg("platform_apps/launch_files/test.txt");
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/get_display_path"))
       << message_;
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, OpenLink) {
   ASSERT_TRUE(StartTestServer());
-  ui_test_utils::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_TAB_ADDED,
       content::Source<content::WebContentsDelegate>(browser()));
   LoadAndLaunchPlatformApp("open_link");
   observer.Wait();
   ASSERT_EQ(2, browser()->tab_count());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, BrowserTag) {
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/browser_tag")) << message_;
 }
@@ skipping 21 matching lines @@
   automation_util::GetCookies(set_cookie_url,
                               chrome::GetWebContentsAt(browser(), 0),
                               &cookie_size, &cookie_value);
   ASSERT_EQ("testCookie=1", cookie_value);
 
   // Create a listener to JS message to know when the app has launched.
   ExtensionTestMessageListener launched_listener("Launched", false);
   LoadAndLaunchPlatformApp("browser_tag_isolation");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
-  ui_test_utils::WindowedNotificationObserver load_stop_observer(
+  content::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   load_stop_observer.Wait();
   content::Source<content::NavigationController> source =
       load_stop_observer.source();
 
   // Test the regular browser context to ensure we still have only one cookie.
   automation_util::GetCookies(GURL("http://localhost"),
                               chrome::GetWebContentsAt(browser(), 0),
                               &cookie_size, &cookie_value);
   ASSERT_EQ("testCookie=1", cookie_value);
 
   ASSERT_TRUE(source->GetWebContents()->GetRenderProcessHost()->IsGuest());
 
   // Now, test the browser tag to ensure we have properly set the cookie and
   // we have only one.
   automation_util::GetCookies(GURL("http://localhost"),
                               source->GetWebContents(),
                               &cookie_size, &cookie_value);
   ASSERT_EQ("isolation_guest=true", cookie_value);
 }