Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3878)

Unified Diff: chrome/browser/ui/login/login_prompt_browsertest.cc

Issue 10815025: Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_brows… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/panels/old_panel_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/login/login_prompt_browsertest.cc
===================================================================
--- chrome/browser/ui/login/login_prompt_browsertest.cc (revision 147602)
+++ chrome/browser/ui/login/login_prompt_browsertest.cc (working copy)
@@ -19,6 +19,7 @@
#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"
@@ -314,7 +315,7 @@
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());
}
@@ -363,7 +364,7 @@
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());
}
@@ -413,8 +414,8 @@
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_));
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/panels/old_panel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698