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

chrome/browser/external_extension_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/command_line.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/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.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"
 
 namespace {
 
 struct IsSearchProviderTestData {
   IsSearchProviderTestData() : tab(NULL) {}
   IsSearchProviderTestData(content::WebContents* t, std::string h, GURL url)
       : tab(t), host(h), test_url(url) {
   }
 
@@ skipping 36 matching lines @@
 
     // Bundle up information needed to verify the result.
     content::WebContents* tab = chrome::GetActiveWebContents(browser);
     return IsSearchProviderTestData(tab, host, test_url);
   }
 
   void FinishIsSearchProviderInstalledTest(
       const IsSearchProviderTestData& data) {
     string16 title = data.tab->GetTitle();
     if (title.empty()) {
-      ui_test_utils::TitleWatcher title_watcher(data.tab, ASCIIToUTF16("OK"));
+      content::TitleWatcher title_watcher(data.tab, ASCIIToUTF16("OK"));
       title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
       title = title_watcher.WaitAndGetTitle();
     }
     EXPECT_EQ(ASCIIToUTF16("OK"), title);
   }
 
   GURL search_provider_test_url_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SearchProviderTest);
@@ skipping 46 matching lines @@
 IN_PROC_BROWSER_TEST_F(SearchProviderTest,
                        TestIsSearchProviderInstalledWithException) {
   // Change the url for the test page to one that throws an exception when
   // toString is called on the argument given to isSearchProviderInstalled.
   search_provider_test_url_ = test_server()->GetURL(
       "files/is_search_provider_installed_with_exception.html");
 
   FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest(
       browser(), "www.google.com", ""));
 }