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

content/browser/worker_host/test/worker_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/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_paths.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/test/layout_browsertest.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
 using content::WorkerServiceImpl;
 
 class WorkerLayoutTest : public InProcessBrowserLayoutTest {
  public:
   WorkerLayoutTest() : InProcessBrowserLayoutTest(
       FilePath(), FilePath().AppendASCII("fast").AppendASCII("workers")) {
@@ skipping 249 matching lines @@
         FilePath(FILE_PATH_LITERAL("workers")),
         FilePath().AppendASCII(test_case));
     return ui_test_utils::GetFileUrlWithQuery(test_file_path, query);
   }
 
   void RunTest(Browser* browser,
                const std::string& test_case,
                const std::string& query) {
     GURL url = GetTestURL(test_case, query);
     const string16 expected_title = ASCIIToUTF16("OK");
-    ui_test_utils::TitleWatcher title_watcher(
+    content::TitleWatcher title_watcher(
         chrome::GetActiveWebContents(browser), expected_title);
     ui_test_utils::NavigateToURL(browser, url);
     string16 final_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, final_title);
   }
 
   void RunTest(const std::string& test_case, const std::string& query) {
     RunTest(browser(), test_case, query);
   }
 
@@ skipping 187 matching lines @@
   // the same worker that was queued in the first window, to ensure it gets
   // connected to the first window too.
   query = StringPrintf("?id=%d", max_workers_per_tab);
   url = GetTestURL("single_shared_worker.html", query);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, NEW_FOREGROUND_TAB,
         ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1));
 }