Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_brows…

chrome/browser/referrer_policy_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/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/test/test_server.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
 // GTK requires a X11-level mouse event to open a context menu correctly.
 #if defined(TOOLKIT_GTK)
 #define MAYBE_ContextMenuOrigin DISABLED_ContextMenuOrigin
 #define MAYBE_HttpsContextMenuOrigin DISABLED_HttpsContextMenuOrigin
 #define MAYBE_ContextMenuRedirect DISABLED_ContextMenuRedirect
 #define MAYBE_HttpsContextMenuRedirect DISABLED_HttpsContextMenuRedirect
 #else
@@ skipping 50 matching lines @@
       case EXPECT_ORIGIN_AS_REFERRER:
         referrer = "Referrer is " + url.GetWithEmptyPath().spec();
         break;
     }
     return ASCIIToUTF16(referrer);
   }
 
   // Adds all possible titles to the TitleWatcher, so we don't time out
   // waiting for the title if the test fails.
   void AddAllPossibleTitles(const GURL& url,
-                            ui_test_utils::TitleWatcher* title_watcher) {
+                            content::TitleWatcher* title_watcher) {
     title_watcher->AlsoWaitForTitle(
         GetExpectedTitle(url, EXPECT_EMPTY_REFERRER));
     title_watcher->AlsoWaitForTitle(
         GetExpectedTitle(url, EXPECT_FULL_REFERRER));
     title_watcher->AlsoWaitForTitle(
         GetExpectedTitle(url, EXPECT_ORIGIN_AS_REFERRER));
   }
 
   // Navigates from a page with a given |referrer_policy| and checks that the
   // reported referrer matches the expectation.
@@ skipping 31 matching lines @@
         "&redirect=" + (redirect ? "true" : "false") +
         "&link=" +
             (button == WebKit::WebMouseEvent::ButtonNone ? "false" : "true") +
         "&target=" + (target_blank ? "_blank" : ""));
 
     ui_test_utils::WindowedTabAddedNotificationObserver tab_added_observer(
         content::NotificationService::AllSources());
 
     string16 expected_title = GetExpectedTitle(start_url, expected_referrer);
     content::WebContents* tab = chrome::GetActiveWebContents(browser());
-    ui_test_utils::TitleWatcher title_watcher(tab, expected_title);
+    content::TitleWatcher title_watcher(tab, expected_title);
 
     // Watch for all possible outcomes to avoid timeouts if something breaks.
     AddAllPossibleTitles(start_url, &title_watcher);
 
     ui_test_utils::NavigateToURL(browser(), start_url);
 
     if (button != WebKit::WebMouseEvent::ButtonNone) {
       WebKit::WebMouseEvent mouse_event;
       mouse_event.type = WebKit::WebInputEvent::MouseDown;
       mouse_event.button = button;
@@ skipping 219 matching lines @@
   GURL start_url = RunReferrerTest("origin", true, false, true, false,
                                    WebKit::WebMouseEvent::ButtonLeft,
                                    EXPECT_ORIGIN_AS_REFERRER);
 
   // Navigate to C.
   ui_test_utils::NavigateToURL(browser(), test_server_->GetURL(""));
 
   string16 expected_title =
       GetExpectedTitle(start_url, EXPECT_ORIGIN_AS_REFERRER);
   content::WebContents* tab = chrome::GetActiveWebContents(browser());
-  scoped_ptr<ui_test_utils::TitleWatcher> title_watcher(
-      new ui_test_utils::TitleWatcher(tab, expected_title));
+  scoped_ptr<content::TitleWatcher> title_watcher(
+      new content::TitleWatcher(tab, expected_title));
 
   // Watch for all possible outcomes to avoid timeouts if something breaks.
   AddAllPossibleTitles(start_url, title_watcher.get());
 
   // Go back to B.
   chrome::GoBack(browser(), CURRENT_TAB);
   EXPECT_EQ(expected_title, title_watcher->WaitAndGetTitle());
 
-  title_watcher.reset(new ui_test_utils::TitleWatcher(tab, expected_title));
+  title_watcher.reset(new content::TitleWatcher(tab, expected_title));
   AddAllPossibleTitles(start_url, title_watcher.get());
 
   // Reload to B.
   chrome::Reload(browser(), CURRENT_TAB);
   EXPECT_EQ(expected_title, title_watcher->WaitAndGetTitle());
 
-  title_watcher.reset(new ui_test_utils::TitleWatcher(tab, expected_title));
+  title_watcher.reset(new content::TitleWatcher(tab, expected_title));
   AddAllPossibleTitles(start_url, title_watcher.get());
 
   // Shift-reload to B.
   chrome::ReloadIgnoringCache(browser(), CURRENT_TAB);
   EXPECT_EQ(expected_title, title_watcher->WaitAndGetTitle());
 }