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

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

Issue 7124009: Roll V8 to version 3.4.2. Second attempt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 | « DEPS ('k') | webkit/tools/layout_tests/test_expectations.txt » ('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 88118)
+++ chrome/browser/prerender/prerender_browsertest.cc (working copy)
@@ -89,7 +89,8 @@
}
virtual ~TestPrerenderContents() {
- EXPECT_EQ(expected_final_status_, final_status()) <<
+ EXPECT_EQ(FinalStatusCanonicalize(expected_final_status_),
+ FinalStatusCanonicalize(final_status())) <<
" when testing URL " << prerender_url().path();
// Prerendering RenderViewHosts should be hidden before the first
// navigation, so this should be happen for every PrerenderContents for
@@ -177,6 +178,13 @@
PrerenderContents::Observe(type, source, details);
}
+ static FinalStatus FinalStatusCanonicalize(FinalStatus final) {
+ if (final == FINAL_STATUS_JS_OUT_OF_MEMORY) {
+ return FINAL_STATUS_MEMORY_LIMIT_EXCEEDED;
+ }
+ return final;
+ }
+
int number_of_loads_;
int expected_number_of_loads_;
FinalStatus expected_final_status_;
« no previous file with comments | « DEPS ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698