[HBD] Tighten-up which adobe.com/go links are intercepted as Flash URLs

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 "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ skipping 14 matching lines @@
 
 using content::BrowserThread;
 using content::NavigationHandle;
 using content::NavigationThrottle;
 
 namespace {
 
 // Regexes matching
 const char kGetFlashURLCanonicalRegex[] = "(?i)get\\.adobe\\.com/.*flash.*";
 const char kGetFlashURLSecondaryRegex[] =
-    "(?i)(www\\.)?(adobe|macromedia)\\.com/go.*"
-    "(get[-_]?flash|fl(ash)?.?pl(ayer)?|flash_completion|flashpm|flashdownload|"
-    "fp|h-m-a-?2|chrome|download_player|gnav_fl|pdcredirect).*";
+    "(?i)(www\\.)?(adobe|macromedia)\\.com/go/"
+    "((?i).*get[-_]?flash|getfp10android|.*fl(ash)player|.*flashpl|"
+    ".*flash_player|flash_completion|flashpm|.*flashdownload|d65_flplayer|"
+    "fp_jp|runtimes_fp|[a-z_-]{3,6}h-m-a-?2|chrome|download_player|"
+    "gnav_fl|pdcredirect).*";
 
 void DoNothing(ContentSetting result) {}
 
 bool InterceptNavigation(
     const GURL& source_url,
     content::WebContents* source,
     const navigation_interception::NavigationParams& params) {
   FlashDownloadInterception::InterceptFlashDownloadNavigation(source,
                                                               source_url);
   return true;
@@ skipping 34 matching lines @@
     HostContentSettingsMap* host_content_settings_map,
     const GURL& source_url,
     const GURL& target_url,
     bool has_user_gesture) {
   if (!PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map))
     return false;
 
   if (!has_user_gesture)
     return false;
 
+  url::Replacements<char> replacements;
+  replacements.ClearQuery();
+  replacements.ClearRef();
+  replacements.ClearUsername();
+  replacements.ClearPassword();
+
   // If the navigation source is already the Flash download page, don't
   // intercept the download. The user may be trying to download Flash.
-  if (RE2::PartialMatch(source_url.GetContent(), kGetFlashURLCanonicalRegex))
+  std::string source_url_str =
+      source_url.ReplaceComponents(replacements).GetContent();
+  if (RE2::PartialMatch(source_url_str, kGetFlashURLCanonicalRegex))
     return false;
 
-  std::string target_url_str = target_url.GetContent();
+  std::string target_url_str =
+      target_url.ReplaceComponents(replacements).GetContent();
   if (RE2::FullMatch(target_url_str, kGetFlashURLCanonicalRegex) ||
       RE2::FullMatch(target_url_str, kGetFlashURLSecondaryRegex)) {
     ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
         host_content_settings_map, url::Origin(source_url), source_url,
         nullptr);
     flash_setting = PluginsFieldTrial::EffectiveContentSetting(
         host_content_settings_map, CONTENT_SETTINGS_TYPE_PLUGINS,
         flash_setting);
 
     return flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT ||
@@ skipping 29 matching lines @@
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile);
   if (!ShouldStopFlashDownloadAction(host_content_settings_map, source_url,
                                      handle->GetURL(), has_user_gesture)) {
     return nullptr;
   }
 
   return base::MakeUnique<navigation_interception::InterceptNavigationThrottle>(
       handle, base::Bind(&InterceptNavigation, source_url), true);
 }