Prerendering: Add MatchComplete PPLT

chrome/browser/prerender/prerender_browsertest.cc

Index: chrome/browser/prerender/prerender_browsertest.cc
===================================================================
--- chrome/browser/prerender/prerender_browsertest.cc	(revision 109949)
+++ 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()) <<

[cbentzel, 2011/11/15 12:05:29]

This has been useful in the past for catching problems - now it seems like we
will always create one with MATCH_COMPLETE_DUMMY. It seems like it would be
better to queue up a dummy expected final status in the places that use it.

-          "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.";
@@ -723,8 +724,10 @@
       }
     } else {
       // In the failure case, we should have removed |dest_url_| from the
-      // prerender_manager.
-      EXPECT_TRUE(prerender_contents == NULL);
+      // prerender_manager.  We ignore dummy PrerenderContents (as indicated
+      // by not having started).
+      EXPECT_TRUE(prerender_contents == NULL ||
+                  !prerender_contents->prerendering_has_started());
     }
   }
 
@@ -1837,7 +1840,8 @@
 
 // Validate that the sessionStorage namespace remains the same when swapping
 // in a prerendered page.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorage) {
+// http://crbug.com/103563

[cbentzel, 2011/11/15 12:05:29]

Why is this disabled? As mentioned in the bug, we aren't seeing problems on the
flakiness dashboard after my fix. I'm worried that there was something wrong
with your local repo. 

+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) {
   set_loader_path("files/prerender/prerender_loader_with_session_storage.html");
   PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"),
                    FINAL_STATUS_USED,