Stop pretending that a Flash setting of DETECT_IMPORTANT_CONTENT is ASK.

chrome/browser/plugins/flash_permission_context.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_permission_context.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/plugins/flash_temporary_permission_tracker.h"
 #include "chrome/browser/plugins/plugin_utils.h"
@@ skipping 28 matching lines @@
 ContentSetting FlashPermissionContext::GetPermissionStatusInternal(
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(profile());
   ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
       host_content_settings_map, url::Origin(embedding_origin),
       requesting_origin, nullptr);
   flash_setting = PluginsFieldTrial::EffectiveContentSetting(
       host_content_settings_map, content_settings_type(), flash_setting);
-  if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)
-    return CONTENT_SETTING_ASK;

[raymes, 2017/03/05 23:55:40]

I'm not sure if we want to do this? Won't this have potential behavioral
implications? We just want to change the UI.

[tommycli, 2017/03/06 19:10:26]

I agree. I missed that this was in FlashPermissionContext. I agree with Raymes
that this seems like it will have negative side effects.

[lgarron, 2017/03/09 02:47:19]

Could you explain to me what those effects are?
If the general behaviour is not ASK yet, I don't quite understand why returning
DETECT here is not alright. (Can we fix the call sites to interpret DETECT
correctly?)

[raymes, 2017/03/09 03:01:07]

Ask means "show a prompt" in the permissions code, and that's what we want to
happen in this case. This actually happens to work because of the way the code
is written, but I don't think we should rely on that (which is why this test
doesn't fail). There is other code that assumes that ASK means show a prompt,
which is intuitive.

I think the right solution is to get rid of DETECT as an option which I hope
we'll be able to do soon.

   return flash_setting;
 }
 
 void FlashPermissionContext::UpdateTabContext(const PermissionRequestID& id,
                                               const GURL& requesting_origin,
                                               bool allowed) {
   if (!allowed)
     return;
 
   content::WebContents* web_contents =
@@ skipping 35 matching lines @@
   else
     pattern = ContentSettingsPattern::FromURLNoWildcard(embedding_origin);
   host_content_settings_map->SetContentSettingCustomScope(
       pattern, ContentSettingsPattern::Wildcard(), content_settings_type(),
       std::string(), content_setting);
 }
 
 bool FlashPermissionContext::IsRestrictedToSecureOrigins() const {
   return false;
 }