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

content/test/layout_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 "content/test/layout_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/layout_test_http_server.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_paths.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
 static const char kPlatformName[] = "chromium-win";
 #elif defined(OS_MACOSX)
 static const char kPlatformName[] = "chromium-mac";
 #elif defined(OS_LINUX)
 static const char kPlatformName[] = "chromium-linux";
 #elif defined(OS_OPENBSD)
 static const char kPlatformName[] = "chromium-openbsd";
@@ skipping 146 matching lines @@
   GURL url(StringPrintf(
       "http://127.0.0.1:%d/%s/%s", port_, test_case_dir_.MaybeAsASCII().c_str(),
       test_case_file_name.c_str()));
   RunLayoutTestInternal(test_case_file_name, url);
 }
 
 void InProcessBrowserLayoutTest::RunLayoutTestInternal(
     const std::string& test_case_file_name, const GURL& url) {
   LOG(INFO) << "Navigating to URL " << url << " and blocking.";
   const string16 expected_title = ASCIIToUTF16("done");
-  ui_test_utils::TitleWatcher title_watcher(
+  content::TitleWatcher title_watcher(
       chrome::GetActiveWebContents(browser()), expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
   LOG(INFO) << "Navigation completed, now waiting for title.";
   string16 final_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, final_title);
 
   std::string actual_text;
   ScrapeResultFromBrowser(browser(), &actual_text);
   ReplaceSubstringsAfterOffset(&actual_text, 0, "\r", "");
   TrimString(actual_text, "\n", &actual_text);
@@ skipping 53 matching lines @@
   ASSERT_TRUE(file_util::ReadFileToString(path_to_single_test, &test_html));
 
   size_t insertion_position = FindInsertPosition(test_html);
   test_html.insert(insertion_position, preamble);
   *test_path = our_layout_test_temp_dir_.Append(test_case_dir_);
   *test_path = test_path->AppendASCII(test_case_file_name);
   ASSERT_TRUE(file_util::WriteFile(*test_path,
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
 }