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

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

Issue 8503040: Prerendering: Add MatchComplete PPLT (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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
===================================================================
--- chrome/browser/prerender/prerender_browsertest.cc (revision 109293)
+++ chrome/browser/prerender/prerender_browsertest.cc (working copy)
@@ -127,7 +127,8 @@
should_be_shown_(expected_final_status == FINAL_STATUS_USED),
quit_message_loop_on_destruction_(
expected_final_status != FINAL_STATUS_EVICTED &&
- expected_final_status != FINAL_STATUS_APP_TERMINATING),
+ expected_final_status != FINAL_STATUS_APP_TERMINATING &&
+ expected_final_status != FINAL_STATUS_MATCH_COMPLETE_DUMMY),
expected_pending_prerenders_(0) {
if (expected_number_of_loads == 0)
MessageLoopForUI::current()->Quit();
@@ -303,11 +304,11 @@
const GURL& referrer,
Origin origin,
uint8 experiment_id) OVERRIDE {
- CHECK(!expected_final_status_queue_.empty()) <<
- "Creating prerender contents for " << url.path() <<
- " with no expected final status";
- FinalStatus expected_final_status = expected_final_status_queue_.front();
- expected_final_status_queue_.pop_front();
+ FinalStatus expected_final_status = FINAL_STATUS_MATCH_COMPLETE_DUMMY;
+ if (!expected_final_status_queue_.empty()) {
+ expected_final_status = expected_final_status_queue_.front();
+ expected_final_status_queue_.pop_front();
+ }
VLOG(1) << "Creating prerender contents for " << url.path() <<
" with expected final status " << expected_final_status;
VLOG(1) << expected_final_status_queue_.size() << " left in the queue.";
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_contents.h » ('j') | chrome/browser/prerender/prerender_contents.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698