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

Unified Diff: chrome/browser/prerender/prerender_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/prerender/prefetch_browsertest.cc ('k') | chrome/browser/referrer_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
===================================================================
--- chrome/browser/prerender/prerender_browsertest.cc (revision 147602)
+++ chrome/browser/prerender/prerender_browsertest.cc (working copy)
@@ -48,6 +48,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
#include "grit/generated_resources.h"
@@ -250,7 +251,7 @@
session_storage_namespace);
string16 ready_title = ASCIIToUTF16(kReadyTitle);
if (prerender_should_wait_for_ready_title_)
- ready_title_watcher_.reset(new ui_test_utils::TitleWatcher(
+ ready_title_watcher_.reset(new content::TitleWatcher(
web_contents, ready_title));
return web_contents;
}
@@ -364,7 +365,7 @@
// If true, before calling DidPrerenderPass, will wait for the title of the
// prerendered page to turn to "READY".
bool prerender_should_wait_for_ready_title_;
- scoped_ptr<ui_test_utils::TitleWatcher> ready_title_watcher_;
+ scoped_ptr<content::TitleWatcher> ready_title_watcher_;
};
// PrerenderManager that uses TestPrerenderContents.
@@ -689,7 +690,7 @@
void NavigateToDestUrlAndWaitForPassTitle() {
string16 expected_title = ASCIIToUTF16(kPassTitle);
- ui_test_utils::TitleWatcher title_watcher(
+ content::TitleWatcher title_watcher(
GetPrerenderContents()->prerender_contents()->web_contents(),
expected_title);
NavigateToDestURL();
@@ -2114,7 +2115,7 @@
set_loader_path("files/prerender/prerender_loader_with_unload.html");
PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
string16 expected_title = ASCIIToUTF16("Unloaded");
- ui_test_utils::TitleWatcher title_watcher(
+ content::TitleWatcher title_watcher(
chrome::GetActiveWebContents(current_browser()), expected_title);
NavigateToDestURL();
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
« no previous file with comments | « chrome/browser/prerender/prefetch_browsertest.cc ('k') | chrome/browser/referrer_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698