Hookup the window.open flash download interception to the permission prompt

chrome/browser/plugins/flash_download_interception.cc

 // Copyright 2016 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/plugins/flash_download_interception.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 13 matching lines @@
 using content::BrowserThread;
 using content::NavigationHandle;
 using content::NavigationThrottle;
 
 namespace {
 
 const char kFlashDownloadURL[] = "get.adobe.com/flash";
 
 void DoNothing(blink::mojom::PermissionStatus result) {}
 
-bool ShouldInterceptNavigation(
+bool InterceptNavigation(

[Lei Zhang, 2016/09/30 01:22:46]

Why bother returning true if that's what we always do? Are there plans to
eventually return false? Or is it just to make the rest of the code happy?

[raymes, 2016/09/30 01:53:19]

Just to make the code happy - the callback needs to have it I think.

     content::WebContents* source,
     const navigation_interception::NavigationParams& params) {
+  FlashDownloadInterception::InterceptFlashDownloadNavigation(source);
+  return true;
+}
+
+}  // namespace
+
+// static
+void FlashDownloadInterception::InterceptFlashDownloadNavigation(
+    content::WebContents* source) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   PermissionManager* manager = PermissionManager::Get(
       Profile::FromBrowserContext(source->GetBrowserContext()));
   manager->RequestPermission(
       content::PermissionType::FLASH, source->GetMainFrame(),
       source->GetLastCommittedURL(), true, base::Bind(&DoNothing));
-
-  return true;
 }
 
-}  // namespace
-
 // static
 bool FlashDownloadInterception::ShouldStopFlashDownloadAction(
     HostContentSettingsMap* host_content_settings_map,
     const GURL& source_url,
     const GURL& target_url,
     bool has_user_gesture) {
   if (!base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins))
     return false;
 
   if (!has_user_gesture)
@@ skipping 26 matching lines @@
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
   GURL source_url = handle->GetWebContents()->GetLastCommittedURL();
   if (!ShouldStopFlashDownloadAction(host_content_settings_map, source_url,
                                      handle->GetURL(),
                                      handle->HasUserGesture())) {
     return nullptr;
   }
 
   return base::MakeUnique<navigation_interception::InterceptNavigationThrottle>(
-      handle, base::Bind(&ShouldInterceptNavigation), true);
+      handle, base::Bind(&InterceptNavigation), true);
 }