Revert 109719 - Prerendering: Add MatchComplete PPLT

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <deque>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 109 matching lines @@
                           PrerenderManager::kNoExperiment),
         number_of_loads_(0),
         expected_number_of_loads_(expected_number_of_loads),
         expected_final_status_(expected_final_status),
         new_render_view_host_(NULL),
         was_hidden_(false),
         was_shown_(false),
         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_MATCH_COMPLETE_DUMMY),
+            expected_final_status != FINAL_STATUS_APP_TERMINATING),
         expected_pending_prerenders_(0) {
     if (expected_number_of_loads == 0)
       MessageLoopForUI::current()->Quit();
   }
 
   virtual ~TestPrerenderContents() {
     EXPECT_EQ(expected_final_status_, final_status()) <<
               " when testing URL " << prerender_url().path() <<
               " (Expected: " << NameFromFinalStatus(expected_final_status_) <<
               ", Actual: " << NameFromFinalStatus(final_status()) << ")";
@@ skipping 155 matching lines @@
   }
 
   virtual PrerenderContents* CreatePrerenderContents(
       PrerenderManager* prerender_manager,
       PrerenderTracker* prerender_tracker,
       Profile* profile,
       const GURL& url,
       const GURL& referrer,
       Origin origin,
       uint8 experiment_id) OVERRIDE {
-    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();
-    }
+    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();
     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.";
     return new TestPrerenderContents(prerender_manager, prerender_tracker,
                                      profile, url,
                                      referrer, expected_number_of_loads_,
                                      expected_final_status);
   }
 
  private:
@@ skipping 395 matching lines @@
         // Check if page behaves as expected while in prerendered state.
         bool prerender_test_result = false;
         ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
             prerender_contents->render_view_host_mutable(), L"",
             L"window.domAutomationController.send(DidPrerenderPass())",
             &prerender_test_result));
         EXPECT_TRUE(prerender_test_result);
       }
     } else {
       // In the failure case, we should have removed |dest_url_| from the
-      // prerender_manager.  We ignore dummy PrerenderContents (as indicated
-      // by not having started).
-      EXPECT_TRUE(prerender_contents == NULL ||
-                  !prerender_contents->prerendering_has_started());
+      // prerender_manager.
+      EXPECT_TRUE(prerender_contents == NULL);
     }
   }
 
   void NavigateToURLImpl(const GURL& dest_url,
                          WindowOpenDisposition disposition) const {
     // Make sure in navigating we have a URL to use in the PrerenderManager.
     ASSERT_TRUE(GetPrerenderContents() != NULL);
 
     // If opening the page in a background tab, it won't be shown when swapped
     // in.
@@ skipping 1092 matching lines @@
   DevToolsManager* manager = DevToolsManager::GetInstance();
   FakeDevToolsClientHost client_host;
   manager->RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
   const char* url = "files/prerender/prerender_page.html";
   PrerenderTestURL(url, FINAL_STATUS_DEVTOOLS_ATTACHED, 1);
   NavigateToURL(url);
 }
 
 // Validate that the sessionStorage namespace remains the same when swapping
 // in a prerendered page.
-// http://crbug.com/103563
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) {
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorage) {
   set_loader_path("files/prerender/prerender_loader_with_session_storage.html");
   PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"),
                    FINAL_STATUS_USED,
                    1);
   NavigateToDestURL();
   GoBackToPageBeforePrerender(browser());
 }
 
 }  // namespace prerender