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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test exclusion. Created 7 years, 2 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
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 94b03bfdaeb9149572f514462c3305b8c5456162..d22560a0bd5a8819578fe1c061e91ca7ef2b4818 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -2019,6 +2019,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) {
// There should be no tabs with the Prerender prefix.
const string16 tab_prefix =
l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_TAB_PREFIX, string16());
+ const string16 instant_tab_prefix =
+ l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_INSTANT_OVERLAY_PREFIX,
+ string16());
num_prerender_tabs = 0;
int num_tabs_with_prerender_page_title = 0;
model->Refresh();
@@ -2027,14 +2030,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) {
string16 tab_title = model->GetResourceTitle(i);
if (StartsWith(tab_title, prefix, true)) {
++num_prerender_tabs;
- } else {
- EXPECT_TRUE(StartsWith(tab_title, tab_prefix, true));
-
+ } else if (StartsWith(tab_title, tab_prefix, true)) {
// The prerender tab should now be a normal tab but the title should be
// the same. Depending on timing, there may be more than one of these.
const string16 tab_page_title = tab_title.substr(tab_prefix.length());
if (prerender_page_title.compare(tab_page_title) == 0)
++num_tabs_with_prerender_page_title;
+ } else {
+ EXPECT_TRUE(StartsWith(tab_title, instant_tab_prefix, true));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698