| 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.";
|
|
|