chrome/browser/errorpage_browsertest.cc - Issue 10815025: Move TitleWatcher from ui_test_utils.h to browser_test_utils.h so it can be reused by content_brows…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/errorpage_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/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/external_extension_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/errorpage_browsertest.cc

===================================================================

--- chrome/browser/errorpage_browsertest.cc (revision 147602)

+++ chrome/browser/errorpage_browsertest.cc (working copy)

@@ -12,6 +12,7 @@

#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/test/browser_test_utils.h"

#include "content/public/test/test_navigation_observer.h"

#include "content/test/net/url_request_failed_job.h"

#include "content/test/net/url_request_mock_http_job.h"

@@ -39,7 +40,7 @@

void NavigateToURLAndWaitForTitle(const GURL& url,

const std::string& expected_title,

int num_navigations) {

- ui_test_utils::TitleWatcher title_watcher(

+ content::TitleWatcher title_watcher(

chrome::GetActiveWebContents(browser()),

ASCIIToUTF16(expected_title));

@@ -85,7 +86,7 @@

void NavigateHistoryAndWaitForTitle(const std::string& expected_title,

int num_navigations,

HistoryNavigationDirection direction) {

- ui_test_utils::TitleWatcher title_watcher(

+ content::TitleWatcher title_watcher(

chrome::GetActiveWebContents(browser()),

ASCIIToUTF16(expected_title));