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

content/browser/session_history_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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.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/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SessionHistoryTest : public InProcessBrowserTest {
  protected:
   SessionHistoryTest() {}
 
   virtual void SetUpOnMainThread() {
     ASSERT_TRUE(test_server()->Start());
   }
@@ skipping 35 matching lines @@
     return chrome::GetActiveWebContents(browser())->GetURL();
   }
 
   GURL GetURL(const std::string file) {
     return test_server()->GetURL(std::string("files/session_history/") + file);
   }
 
   void NavigateAndCheckTitle(const char* filename,
                              const std::string& expected_title) {
     string16 expected_title16(ASCIIToUTF16(expected_title));
-    ui_test_utils::TitleWatcher title_watcher(
+    content::TitleWatcher title_watcher(
         chrome::GetActiveWebContents(browser()), expected_title16);
     ui_test_utils::NavigateToURL(browser(), GetURL(filename));
     ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 
   void GoBack() {
     content::WindowedNotificationObserver load_stop_observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::GoBack(browser(), CURRENT_TAB);
@@ skipping 375 matching lines @@
   GoBack();
 
   // Ensure history.length is properly truncated.
   ui_test_utils::NavigateToURL(browser(), GetURL("title2.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }