fix external protocol handling for OOPIFs

chrome/browser/external_protocol/external_protocol_handler.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/external_protocol/external_protocol_handler.h"
 
 #include <stddef.h>
-
 #include <set>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
@@ skipping 56 matching lines @@
         url, render_process_host_id, routing_id, page_transition,
         has_user_gesture);
   }
 }
 
 void LaunchUrlWithoutSecurityCheckWithDelegate(
     const GURL& url,
     int render_process_host_id,
     int tab_contents_id,
     ExternalProtocolHandler::Delegate* delegate) {
+  content::WebContents* web_contents =
+      tab_util::GetWebContentsByID(render_process_host_id, tab_contents_id);
+
   if (!delegate) {
-    ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(
-        url, render_process_host_id, tab_contents_id);
+    ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(url, web_contents);
   } else {
-    delegate->LaunchUrlWithoutSecurityCheck(url);
+    delegate->LaunchUrlWithoutSecurityCheck(url, web_contents);
   }
 }
 
 // When we are about to launch a URL with the default OS level application, we
 // check if the external application will be us. If it is we just ignore the
 // request.
 void OnDefaultProtocolClientWorkerFinished(
     const GURL& escaped_url,
     int render_process_host_id,
     int tab_contents_id,
     bool prompt_user,
     ui::PageTransition page_transition,
     bool has_user_gesture,
     ExternalProtocolHandler::Delegate* delegate,
     shell_integration::DefaultWebClientState state) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (delegate)
     delegate->FinishedProcessingCheck();
-

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

No need to remove the blank line, here and in a few places below.

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

Done.

   if (state == shell_integration::IS_DEFAULT) {
     if (delegate)
       delegate->BlockRequest();
     return;
   }
 
   // If we get here, either we are not the default or we cannot work out
   // what the default is, so we proceed.
   if (prompt_user) {
     // Ask the user if they want to allow the protocol. This will call
     // LaunchUrlWithoutSecurityCheck if the user decides to accept the
     // protocol.
     RunExternalProtocolDialogWithDelegate(escaped_url, render_process_host_id,
                                           tab_contents_id, page_transition,
                                           has_user_gesture, delegate);
     return;
   }
-
   LaunchUrlWithoutSecurityCheckWithDelegate(escaped_url, render_process_host_id,
                                             tab_contents_id, delegate);
 }
 
 }  // namespace
 
 // static
 ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState(
     const std::string& scheme) {
   // If we are being carpet bombed, block the request.
@@ skipping 77 matching lines @@
   // Start the check process running. This will send tasks to the FILE thread
   // and when the answer is known will send the result back to
   // OnDefaultProtocolClientWorkerFinished().
   CreateShellWorker(callback, escaped_url.scheme(), delegate)
       ->StartCheckIsDefault();
 }
 
 // static
 void ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(
     const GURL& url,
-    int render_process_host_id,
-    int tab_contents_id) {
-  content::WebContents* web_contents = tab_util::GetWebContentsByID(
-      render_process_host_id, tab_contents_id);
+    content::WebContents* web_contents) {
   if (!web_contents)
     return;
-
   platform_util::OpenExternal(
       Profile::FromBrowserContext(web_contents->GetBrowserContext()), url);
 }
 
 // static
 void ExternalProtocolHandler::PermitLaunchUrl() {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   g_accept_requests = true;
 }
 
@@ skipping 51 matching lines @@
 // static
 void ExternalProtocolHandler::RecordMetrics(bool selected) {
   UMA_HISTOGRAM_BOOLEAN("BrowserDialogs.ExternalProtocol.RememberCheckbox",
                         selected);
 }
 
 // static
 void ExternalProtocolHandler::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kExcludedSchemes);
 }