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

chrome/browser/ui/login/login_prompt_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 <algorithm>
 #include <list>
 #include <map>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prerender/prerender_manager.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/login/login_prompt.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_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/auth.h"
 #include "net/base/mock_host_resolver.h"
 
 using content::NavigationController;
 using content::OpenURLParams;
 using content::Referrer;
 
 namespace {
 
@@ skipping 275 matching lines @@
   }
 
   ASSERT_EQ(1u, observer.handlers_.size());
   WindowedAuthSuppliedObserver auth_supplied_waiter(controller);
   LoginHandler* handler = *observer.handlers_.begin();
   SetAuthFor(handler);
   auth_supplied_waiter.Wait();
 
   string16 expected_title =
       ExpectedTitleFromAuth(ASCIIToUTF16("basicuser"), ASCIIToUTF16("secret"));
-  ui_test_utils::TitleWatcher title_watcher(contents, expected_title);
+  content::TitleWatcher title_watcher(contents, expected_title);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Test that "Digest" HTTP authentication works.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_page = test_server()->GetURL(kAuthDigestPage);
 
   content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
@@ skipping 28 matching lines @@
   ASSERT_EQ(1u, observer.handlers_.size());
   WindowedAuthSuppliedObserver auth_supplied_waiter(controller);
   LoginHandler* handler = *observer.handlers_.begin();
 
   string16 username(UTF8ToUTF16(username_digest_));
   string16 password(UTF8ToUTF16(password_));
   handler->SetAuth(username, password);
   auth_supplied_waiter.Wait();
 
   string16 expected_title = ExpectedTitleFromAuth(username, password);
-  ui_test_utils::TitleWatcher title_watcher(contents, expected_title);
+  content::TitleWatcher title_watcher(contents, expected_title);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) {
   ASSERT_TRUE(test_server()->Start());
 
   content::WebContents* contents1 = chrome::GetActiveWebContents(browser());
   NavigationController* controller1 = &contents1->GetController();
   LoginPromptBrowserTestObserver observer;
 
@@ skipping 29 matching lines @@
 
   ASSERT_EQ(2u, observer.handlers_.size());
 
   LoginHandler* handler1 = *observer.handlers_.begin();
   LoginHandler* handler2 = *(++(observer.handlers_.begin()));
 
   string16 expected_title1 = ExpectedTitleFromAuth(
       UTF8ToUTF16(username_basic_), UTF8ToUTF16(password_));
   string16 expected_title2 = ExpectedTitleFromAuth(
       UTF8ToUTF16(username_digest_), UTF8ToUTF16(password_));
-  ui_test_utils::TitleWatcher title_watcher1(contents1, expected_title1);
-  ui_test_utils::TitleWatcher title_watcher2(contents2, expected_title2);
+  content::TitleWatcher title_watcher1(contents1, expected_title1);
+  content::TitleWatcher title_watcher2(contents2, expected_title2);
 
   handler1->SetAuth(UTF8ToUTF16(username_basic_), UTF8ToUTF16(password_));
   handler2->SetAuth(UTF8ToUTF16(username_digest_), UTF8ToUTF16(password_));
 
   EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle());
   EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle());
 }
 
 // Test login prompt cancellation.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) {
@@ skipping 574 matching lines @@
   EXPECT_EQ(1, observer.auth_needed_count_);
   EXPECT_EQ(1, observer.auth_supplied_count_);
   EXPECT_EQ(0, observer.auth_cancelled_count_);
   EXPECT_EQ(1, observer_incognito.auth_needed_count_);
   EXPECT_EQ(0, observer_incognito.auth_supplied_count_);
   EXPECT_EQ(0, observer_incognito.auth_cancelled_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 }  // namespace