Revert 82928 - Changing URL match method to support fragments.BUG=79898TEST=PrerenderBrowserTest....

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/string_util.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ skipping 157 matching lines @@
   void PrerenderTestURL(
       const std::string& html_file,
       const std::deque<FinalStatus>& expected_final_status_queue,
       int total_navigations) {
     PrerenderTestURLImpl(html_file,
                          expected_final_status_queue,
                          total_navigations);
   }
 
   void NavigateToDestURL() const {
-    NavigateToURLImpl(dest_url_);
-  }
+    ui_test_utils::NavigateToURL(browser(), dest_url_);
 
-  // Should be const but test_server()->GetURL(...) is not const.
-  void NavigateToURL(const std::string& dest_html_file) {
-    GURL dest_url = test_server()->GetURL(dest_html_file);
-    NavigateToURLImpl(dest_url);
+    // Make sure the PrerenderContents found earlier was used or removed
+    EXPECT_TRUE(prerender_manager()->FindEntry(dest_url_) == NULL);
+
+    // Check if page behaved as expected when actually displayed.
+    bool display_test_result = false;
+    ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+        browser()->GetSelectedTabContents()->render_view_host(), L"",
+        L"window.domAutomationController.send(DidDisplayPass())",
+        &display_test_result));
+    EXPECT_TRUE(display_test_result);
   }
 
   bool UrlIsInPrerenderManager(const std::string& html_file) {
     GURL dest_url = test_server()->GetURL(html_file);
     return (prerender_manager()->FindEntry(dest_url) != NULL);
   }
 
   bool UrlIsInPrerenderManager(const GURL& url) {
     return (prerender_manager()->FindEntry(url) != NULL);
   }
 
   bool UrlIsPendingInPrerenderManager(const std::string& html_file) {
     GURL dest_url = test_server()->GetURL(html_file);
     return (prerender_manager()->FindPendingEntry(dest_url) != NULL);
   }
 
   void set_use_https_src(bool use_https_src_server) {
     use_https_src_server_ = use_https_src_server;
   }
 
   TaskManagerModel* model() const {
     return TaskManager::GetInstance()->model();
   }
 
+  void set_dest_url(const GURL& dest_url) { dest_url_ = dest_url; }
+
  private:
   void PrerenderTestURLImpl(
       const std::string& html_file,
       const std::deque<FinalStatus>& expected_final_status_queue,
       int total_navigations) {
     ASSERT_TRUE(test_server()->Start());
     dest_url_ = test_server()->GetURL(html_file);
 
     std::vector<net::TestServer::StringPair> replacement_text;
     replacement_text.push_back(
@@ skipping 53 matching lines @@
         break;
       }
       default:
         // In the failure case, we should have removed dest_url_ from the
         // prerender_manager.
         EXPECT_TRUE(prerender_contents == NULL);
         break;
     }
   }
 
-  void NavigateToURLImpl(const GURL& dest_url) const {
-    // Make sure in navigating we have a URL to use in the PrerenderManager.
-    EXPECT_TRUE(prerender_manager()->FindEntry(dest_url_) != NULL);
-
-    ui_test_utils::NavigateToURL(browser(), dest_url);
-
-    // Make sure the PrerenderContents found earlier was used or removed.
-    EXPECT_TRUE(prerender_manager()->FindEntry(dest_url_) == NULL);
-
-    // Check if page behaved as expected when actually displayed.
-    bool display_test_result = false;
-    ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-        browser()->GetSelectedTabContents()->render_view_host(), L"",
-        L"window.domAutomationController.send(DidDisplayPass())",
-        &display_test_result));
-    EXPECT_TRUE(display_test_result);
-  }
-
   PrerenderManager* prerender_manager() const {
     Profile* profile = browser()->GetSelectedTabContents()->profile();
     PrerenderManager* prerender_manager = profile->GetPrerenderManager();
     return prerender_manager;
   }
 
   WaitForLoadPrerenderContentsFactory* prc_factory_;
   GURL dest_url_;
   bool use_https_src_server_;
 };
@@ skipping 63 matching lines @@
 
 // Checks that client-issued redirects work with prerendering.
 // This version navigates to the final destination page, rather than the
 // page which does the redirection.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                        PrerenderClientRedirectNavigateToSecond) {
   PrerenderTestURL(
       CreateClientRedirect("files/prerender/prerender_page.html"),
       FINAL_STATUS_USED,
       2);
-  NavigateToURL("files/prerender/prerender_page.html");
+  set_dest_url(test_server()->GetURL("files/prerender/prerender_page.html"));
+  NavigateToDestURL();
 }
 
 // Checks that client-issued redirects to an https page will cancel prerenders.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttps) {
   net::TestServer https_server(net::TestServer::TYPE_HTTPS,
                                FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(https_server.Start());
   GURL https_url = https_server.GetURL("files/prerender/prerender_page.html");
   PrerenderTestURL(CreateClientRedirect(https_url.spec()),
                    FINAL_STATUS_HTTPS,
@@ skipping 57 matching lines @@
 // Checks that server-issued redirects work with prerendering.
 // This version navigates to the final destination page, rather than the
 // page which does the redirection.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                        PrerenderServerRedirectNavigateToSecond) {
   std::string redirect_path;
   PrerenderTestURL(
       CreateServerRedirect("files/prerender/prerender_page.html"),
       FINAL_STATUS_USED,
       1);
-  NavigateToURL("files/prerender/prerender_page.html");
+  set_dest_url(test_server()->GetURL("files/prerender/prerender_page.html"));
+  NavigateToDestURL();
 }
 
 // TODO(cbentzel): Add server-redirect-to-https test. http://crbug.com/79182
 
 // Checks that server-issued redirects within an iframe in a prerendered
 // page will not count as an "alias" for the prerendered page.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectInIframe) {
   std::string redirect_path = CreateServerRedirect(
       "/files/prerender/prerender_embedded_content.html");
   std::vector<net::TestServer::StringPair> replacement_text;
@@ skipping 79 matching lines @@
 // Checks that popups on a prerendered page cause cancellation.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPopup) {
   PrerenderTestURL("files/prerender/prerender_popup.html",
                    FINAL_STATUS_CREATE_NEW_WINDOW,
                    1);
 }
 
 
 
 // Checks that renderers using excessive memory will be terminated.
-// Disabled, http://crbug.com/77870.
+// Disabled, http://crbug.com/80324.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                        DISABLED_PrerenderExcessiveMemory) {
   PrerenderTestURL("files/prerender/prerender_excessive_memory.html",
                    FINAL_STATUS_MEMORY_LIMIT_EXCEEDED,
                    1);
 }
 
 // Checks that we don't prerender in an infinite loop.
-// Disabled, http://crbug.com/80324.
+// Disabled, http://crbug.com/77323.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderInfiniteLoop) {
   const char* const kHtmlFileA = "prerender_infinite_a.html";
   const char* const kHtmlFileB = "prerender_infinite_b.html";
 
   std::deque<FinalStatus> expected_final_status_queue;
   expected_final_status_queue.push_back(FINAL_STATUS_USED);
   expected_final_status_queue.push_back(FINAL_STATUS_APP_TERMINATING);
 
   PrerenderTestURL(kHtmlFileA, expected_final_status_queue, 1);
 
@@ skipping 107 matching lines @@
 }
 
 // Checks that prerenderers will terminate when the RenderView crashes.
 // Note that the prerendering RenderView will be redirected to about:crash.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) {
   PrerenderTestURL(CreateClientRedirect("files/prerender/prerender_page.html"),
                    FINAL_STATUS_RENDERER_CRASHED,
                    1);
 }
 
-// Checks that we correctly use a prerendered page when navigating to a
-// fragment.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNavigateFragment) {
-  PrerenderTestURL("files/prerender/prerender_fragment.html",
-                   FINAL_STATUS_USED,
-                   1);
-  NavigateToURL("files/prerender/prerender_fragment.html#fragment");
-}
-
-// Checks that we correctly use a prerendered page when we prerender a fragment
-// but navigate to the main page.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderFragmentNavigatePage) {
-  PrerenderTestURL("files/prerender/prerender_page.html#fragment",
-                   FINAL_STATUS_USED,
-                   1);
-  NavigateToURL("files/prerender/prerender_page.html");
-}
-
-// Checks that we correctly use a prerendered page when we prerender a fragment
-// but navigate to a different fragment on the same page.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
-                       PrerenderFragmentNavigateFragment) {
-  PrerenderTestURL("files/prerender/prerender_fragment.html#other_fragment",
-                   FINAL_STATUS_USED,
-                   1);
-  NavigateToURL("files/prerender/prerender_fragment.html#fragment");
-}
-
-// Checks that we correctly use a prerendered page when the page uses meta
-// http-equiv to refresh to a fragment on the same page.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
-                       PrerenderClientRedirectToFragment) {
-  PrerenderTestURL(
-      CreateClientRedirect("files/prerender/prerender_fragment.html#fragment"),
-      FINAL_STATUS_USED,
-      2);
-  NavigateToURL(
-      CreateClientRedirect("files/prerender/prerender_fragment.html"));
-}
-
-// Checks that we correctly use a prerendered page when the page uses JS to set
-// the window.location.hash to a fragment on the same page.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
-                       PrerenderPageChangeFragmentLocationHash) {
-  PrerenderTestURL("files/prerender/prerender_fragment_location_hash.html",
-                   FINAL_STATUS_USED,
-                   1);
-  NavigateToURL("files/prerender/prerender_fragment_location_hash.html");
-}
-
 }  // namespace prerender