[HBD] Detect user-initiated Flash download in a new window

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 19 matching lines @@
     content::WebContents* source,
     const navigation_interception::NavigationParams& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // TODO(crbug.com/626728): Implement permission prompt logic.
   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)
+    return false;
+
+  if (!base::StartsWith(target_url.GetContent(), kFlashDownloadURL,
+                        base::CompareCase::INSENSITIVE_ASCII)) {
+    return false;
+  }
+
+  std::unique_ptr<base::Value> general_setting =
+      host_content_settings_map->GetWebsiteSetting(
+          source_url, source_url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),
+          nullptr);
+  ContentSetting plugin_setting =
+      content_settings::ValueToContentSetting(general_setting.get());
+  plugin_setting = PluginsFieldTrial::EffectiveContentSetting(
+      CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
+
+  return plugin_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
+}
+
+// static
 std::unique_ptr<NavigationThrottle>
 FlashDownloadInterception::MaybeCreateThrottleFor(NavigationHandle* handle) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  if (!base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins))
+  // Never intercept Flash Download navigations in a new window.
+  if (handle->GetWebContents()->HasOpener())
     return nullptr;
 
-  if (!handle->HasUserGesture())
-    return nullptr;
-
-  if (!base::StartsWith(handle->GetURL().GetContent(), kFlashDownloadURL,
-                        base::CompareCase::INSENSITIVE_ASCII)) {
-    return nullptr;
-  }
-
   Profile* profile = Profile::FromBrowserContext(
       handle->GetWebContents()->GetBrowserContext());
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
-  GURL page_url = handle->GetWebContents()->GetLastCommittedURL();
-
-  std::unique_ptr<base::Value> general_setting =
-      host_content_settings_map->GetWebsiteSetting(
-          page_url, page_url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),
-          nullptr);
-  ContentSetting plugin_setting =
-      content_settings::ValueToContentSetting(general_setting.get());
-  plugin_setting = PluginsFieldTrial::EffectiveContentSetting(
-      CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
-
-  if (plugin_setting != CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)
+  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);
 }