Fix SSLUITest.TestBadHTTPSDownload with PlzNavigate.

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <memory>
 #include <string>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 249 matching lines @@
       DLOG(WARNING) << "io_client is null, onReceivedError dropped for " <<
           request->url();
     }
   }
 }
 
 
 void AwResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
-    int child_id,
-    int route_id,
     bool is_content_initiated,
     bool must_download,
     ScopedVector<content::ResourceThrottle>* throttles) {
   GURL url(request->url());
   std::string user_agent;
   std::string content_disposition;
   std::string mime_type;
   int64_t content_length = request->GetExpectedContentSize();
 
   request->extra_request_headers().GetHeader(
       net::HttpRequestHeaders::kUserAgent, &user_agent);
 
 
   net::HttpResponseHeaders* response_headers = request->response_headers();
   if (response_headers) {
     response_headers->GetNormalizedHeader("content-disposition",
         &content_disposition);
     response_headers->GetMimeType(&mime_type);
   }
 
   request->Cancel();
 
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(request);
 
+  // TODO(jam): http://crbug.com/645983 we will need to make this map work with
+  // both RFH IDs and FTN IDs.
   std::unique_ptr<AwContentsIoThreadClient> io_client =
-      AwContentsIoThreadClient::FromID(child_id,
+      AwContentsIoThreadClient::FromID(request_info->GetChildID(),
                                        request_info->GetRenderFrameID());
 
   // POST request cannot be repeated in general, so prevent client from
   // retrying the same request, even if it is with a GET.
   if ("GET" == request->method() && io_client) {
     io_client->NewDownload(url,
                            user_agent,
                            content_disposition,
                            mime_type,
                            content_length);
@@ skipping 134 matching lines @@
       net::HttpRequestHeaders headers;
       headers.AddHeadersFromString(extra_headers);
       for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
         request->SetExtraRequestHeaderByName(it.name(), it.value(), false);
       }
     }
   }
 }
 
 }  // namespace android_webview