**NOTFORLANDING** New link rel=prerender API

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2012 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 "base/stringprintf.h"
@@ skipping 606 matching lines @@
     OpenDestURLWithJSImpl("MetaClick()");
 #else
     OpenDestURLWithJSImpl("CtrlClick()");
 #endif
   }
 
   void OpenDestURLViaWindowOpen() const {
     OpenDestURLWithJSImpl("WindowOpen()");
   }
 
+  void RemoveLinkElementAndNavigate() const {
+    OpenDestURLWithJSImpl("RemoveLinkElementAndNavigate()");
+  }
+
   void ClickToNextPageAfterPrerender(Browser* browser) {
     ui_test_utils::WindowedNotificationObserver new_page_observer(
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::NotificationService::AllSources());
     RenderViewHost* render_view_host =
         browser->GetSelectedWebContents()->GetRenderViewHost();
     render_view_host->ExecuteJavascriptInWebFrame(
         string16(),
         ASCIIToUTF16("ClickOpenLink()"));
     new_page_observer.Wait();
@@ skipping 110 matching lines @@
 
   TestPrerenderContents* GetPrerenderContents() const {
     return static_cast<TestPrerenderContents*>(
         prerender_manager()->FindEntry(dest_url_));
   }
 
   void set_loader_path(const std::string& path) {
     loader_path_ = path;
   }
 
+  void set_loader_query_and_fragment(const std::string& query_and_fragment) {
+    loader_query_and_fragment_ = query_and_fragment;
+  }
+
   GURL GetCrossDomainTestUrl(const std::string& path) {
     static const std::string secondary_domain = "www.foo.com";
     host_resolver()->AddRule(secondary_domain, "127.0.0.1");
     std::string url_str(base::StringPrintf(
         "http://%s:%d/%s",
         secondary_domain.c_str(),
         test_server()->host_port_pair().port(),
         path.c_str()));
     return GURL(url_str);
   }
@@ skipping 40 matching lines @@
     net::TestServer* src_server = test_server();
     scoped_ptr<net::TestServer> https_src_server;
     if (use_https_src_server_) {
       https_src_server.reset(
           new net::TestServer(net::TestServer::TYPE_HTTPS,
                               net::TestServer::kLocalhost,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
       ASSERT_TRUE(https_src_server->Start());
       src_server = https_src_server.get();
     }
-    GURL src_url = src_server->GetURL(replacement_path);
+    GURL src_url = src_server->GetURL(replacement_path +
+                                      loader_query_and_fragment_);

[mmenke, 2012/04/24 15:26:15]

We have "src_url" but "loader_query_and_fragment_" and "loader_path".  Know it
was like this before, but I find it a little confusing.  I suggest renaming the
latter two to something like "src_url_query_and_fragment_" and "src_path"
respectively.

Alternatively, could rename src_url to loader_url.  That makes the variable
names a little clearer, at the cost of losing the src/dest symmetry.

[gavinp, 2012/04/26 23:55:39]

I went with the change to loader_url; what src/dest symmetry are we losing? 
What was called src was the intermediate product, made by translating the loader
file (the src src?) by the replacement text.  That's not src!  That's
intermediate state!

 
     ASSERT_TRUE(prerender_manager());
     prerender_manager()->mutable_config().rate_limit_enabled = false;
     prerender_manager()->mutable_config().https_allowed = true;
     ASSERT_TRUE(prerender_contents_factory_ == NULL);
     prerender_contents_factory_ =
         new WaitForLoadPrerenderContentsFactory(
             expected_number_of_loads,
             expected_final_status_queue,
             prerender_should_wait_for_ready_title);
@@ skipping 109 matching lines @@
   }
 
   WaitForLoadPrerenderContentsFactory* prerender_contents_factory_;
 #if defined(ENABLE_SAFE_BROWSING)
   scoped_ptr<TestSafeBrowsingServiceFactory> safe_browsing_factory_;
 #endif
   GURL dest_url_;
   bool use_https_src_server_;
   bool call_javascript_;
   std::string loader_path_;
+  std::string loader_query_and_fragment_;
   Browser* explicitly_set_browser_;
 };
 
 // Checks that a page is correctly prerendered in the case of a
 // <link rel=prerender> tag and then loaded into a tab in response to a
 // navigation.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPage) {
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
   NavigateToDestURL();

[mmenke, 2012/04/24 15:26:15]

I'd suggest you make sure that the link manager is empty after the tab has been
navigated.  Same goes for the 3 new tests.  There may be other tests where this
is a good idea, too (Like the crash one).

[gavinp, 2012/04/26 23:55:39]

Done.  These tests can even land without being disabled until after the API is
turned on (a subsequent step due to staging), since the prerender_link_manager
will be empty at the end of a run using the phantom request launcher!

 }
 
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovingLink) {
+  set_loader_path("files/prerender/prerender_loader_removing_links.html");
+  set_loader_query_and_fragment("?links_to_insert=1&links_to_remove=1");
+  PrerenderTestURL("files/prerender/prerender_page.html",
+                   FINAL_STATUS_CANCELLED, 1);
+  RemoveLinkElementAndNavigate();
+}
+
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
+                       PrerenderPageRemovingLinkWithTwoLinks) {
+  set_loader_path("files/prerender/prerender_loader_removing_links.html");
+  set_loader_query_and_fragment("?links_to_insert=2&links_to_remove=2");
+  PrerenderTestURL("files/prerender/prerender_page.html",
+                   FINAL_STATUS_CANCELLED, 1);
+  RemoveLinkElementAndNavigate();
+}
+
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
+                       PrerenderPageRemovingLinkWithTwoLinksRemovingOne) {
+  set_loader_path("files/prerender/prerender_loader_removing_links.html");
+  set_loader_query_and_fragment("?links_to_insert=2&links_to_remove=1");
+  PrerenderTestURL("files/prerender/prerender_page.html",
+                   FINAL_STATUS_USED, 1);
+  RemoveLinkElementAndNavigate();
+}
+
 // Checks that prerendering works in incognito mode.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderIncognito) {
   Profile* normal_profile = current_browser()->profile();
   ui_test_utils::OpenURLOffTheRecord(normal_profile, GURL("about:blank"));
   set_browser(BrowserList::FindBrowserWithProfile(
       normal_profile->GetOffTheRecordProfile()));
   // Increase memory expectations on the incognito PrerenderManager.
   IncreasePrerenderMemory();
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
   NavigateToDestURL();
@@ skipping 1179 matching lines @@
   WebContents* web_contents = browser()->GetSelectedWebContents();
   bool display_test_result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       web_contents->GetRenderViewHost(), L"",
       L"DidDisplayReallyPass()",
       &display_test_result));
   ASSERT_TRUE(display_test_result);
 }
 
 }  // namespace prerender