fix external protocol handling for OOPIFs

chrome/browser/loader/chrome_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 "chrome/browser/loader/chrome_resource_dispatcher_host_delegate.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 199 matching lines @@
 
   StreamsPrivateAPI* streams_private = StreamsPrivateAPI::Get(profile);
   if (!streams_private)
     return;
   streams_private->ExecuteMimeTypeHandler(
       extension_id, std::move(stream), view_id, expected_content_size, embedded,
       frame_tree_node_id, render_process_id, render_frame_id);
 }
 #endif  // !BUILDFLAG(ENABLE_EXTENSIONS)
 
+// TODO(davidsac): get rid of useless_render_process_id parameter???

[alexmos, 2016/12/01 19:21:14]

Yes, let's remove this argument.

[davidsac (gone - try alexmos), 2016/12/12 19:15:47]

Done.

+// TODO(davidsac): replace occurences of tab_contents_id with

[alexmos, 2016/12/01 19:21:14]

This comment is for a function that doesn't actually use tab_contents_id, so I'd
remove it from here.

And by the way, doing this rename is indeed something we should do, and it's
fine to do it in a separate CL.

[davidsac (gone - try alexmos), 2016/12/12 19:15:47]

Done.

+// render_view_routing_id
 void LaunchURL(
     const GURL& url,
-    int render_process_id,
+    int useless_render_process_id,
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
     ui::PageTransition page_transition,
     bool has_user_gesture,
     bool is_whitelisted) {
   // If there is no longer a WebContents, the request may have raced with tab
   // closing. Don't fire the external request. (It may have been a prerender.)
   content::WebContents* web_contents = web_contents_getter.Run();
+
+  int render_process_id =
+      web_contents->GetRenderViewHost()->GetProcess()->GetID();
   if (!web_contents)
     return;
 
   // Do not launch external requests attached to unswapped prerenders.
   prerender::PrerenderContents* prerender_contents =
       prerender::PrerenderContents::FromWebContents(web_contents);
   if (prerender_contents) {
     prerender_contents->Destroy(prerender::FINAL_STATUS_UNSUPPORTED_SCHEME);
     prerender::ReportPrerenderExternalURL();
     return;
   }
 
   // If the URL is in whitelist, we launch it without asking the user and
   // without any additional security checks. Since the URL is whitelisted,
   // we assume it can be executed.
   // TODO(davidsac): External protocol handling needs to be
   // fixed for OOPIFs.  See https://crbug.com/668289.
   if (is_whitelisted) {
-    ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(
-        url, render_process_id,
-        web_contents->GetRenderViewHost()->GetRoutingID());
+    ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(url, web_contents);
   } else {
     ExternalProtocolHandler::LaunchUrlWithDelegate(
         url, render_process_id,
         web_contents->GetRenderViewHost()->GetRoutingID(), page_transition,
         has_user_gesture, g_external_protocol_handler_delegate);
   }
 }
 
 #if !defined(DISABLE_NACL)
 void AppendComponentUpdaterThrottles(
@@ skipping 622 matching lines @@
           base::Bind(&ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad,
                     base::Unretained(this), url, request_loading_time));
       return;
   }
 
   std::string metric_name = (request_loading_time.InMilliseconds() < 100 ?
       "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow");
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(), metric_name, url);
 }