Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHost…

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc	(revision 242921)
+++ chrome/browser/chrome_content_browser_client.cc	(working copy)
@@ -1815,17 +1815,25 @@
     const base::Callback<void(net::X509Certificate*)>& callback) {
   content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
       render_process_id, render_frame_id);
-  if (!rfh) {

[jam, 2014/01/03 23:22:10]

this is unnecessary since WebContents::FromRenderFrameHost handles it

-    NOTREACHED();
-    return;
-  }
-
   WebContents* tab = WebContents::FromRenderFrameHost(rfh);
   if (!tab) {
     NOTREACHED();
     return;
   }
 
+  prerender::PrerenderManager* prerender_manager =
+      prerender::PrerenderManagerFactory::GetForProfile(
+          Profile::FromBrowserContext(tab->GetBrowserContext()));
+  if (prerender_manager) {
+    prerender::PrerenderContents* prerender_contents =
+        prerender_manager->GetPrerenderContents(tab);
+    if (prerender_contents) {
+      prerender_contents->Destroy(
+          prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED);
+      return;
+    }
+  }
+
   GURL requesting_url("https://" + cert_request_info->host_and_port.ToString());
   DCHECK(requesting_url.is_valid())
       << "Invalid URL string: https://"