Remove chrome://flags/#enable-ephemeral-flash-permission.

Bug: 892156
Change-Id: I2daa27782f4765d7f770505b0a198b5632678cc6
Reviewed-on: https://chromium-review.googlesource.com/c/1264660
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599317}

chrome/browser/about_flags.cc

@@ -51,7 +51,6 @@
 #include "components/browser_sync/browser_sync_switches.h"
 #include "components/browsing_data/core/features.h"
 #include "components/cloud_devices/common/cloud_devices_switches.h"
-#include "components/content_settings/core/common/features.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
@@ -4191,12 +4190,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kEnableCSSFragmentIdentifiersDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kCSSFragmentIdentifiers)},
 
-    {"enable-ephemeral-flash-permission",
-     flag_descriptions::kEnableEphemeralFlashPermissionName,
-     flag_descriptions::kEnableEphemeralFlashPermissionDescription, kOsDesktop,
-     FEATURE_VALUE_TYPE(
-         content_settings::features::kEnableEphemeralFlashPermission)},
-
 #if !defined(OS_ANDROID)
     {"infinite-session-restore", flag_descriptions::kInfiniteSessionRestoreName,
      flag_descriptions::kInfiniteSessionRestoreDescription, kOsDesktop,

chrome/browser/content_settings/host_content_settings_map_unittest.cc

@@ -30,7 +30,6 @@
 #include "components/content_settings/core/browser/user_modifiable_provider.h"
 #include "components/content_settings/core/browser/website_settings_info.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
-#include "components/content_settings/core/common/features.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/content_settings/core/test/content_settings_test_utils.h"
 #include "components/prefs/pref_service.h"
@@ -1948,11 +1947,10 @@ void ReloadProviders(PrefService* pref_service,
       HostContentSettingsMap::EPHEMERAL_PROVIDER);
 }
 
-// Tests if availability of EnableEphemeralFlashPermission switch results in
-// Flash permissions being reset after restarting.
-// The flag is not available on Android.
+// Tests that Flash permissions are reset after restarting.
+// Flash, and consequently, Flash permissions are not available on Android.
 #if !defined(OS_ANDROID)
-TEST_F(HostContentSettingsMapTest, FlashEphemeralPermissionSwitch) {
+TEST_F(HostContentSettingsMapTest, FlashPermissionsAreEphemeral) {
   TestingProfile profile;
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
@@ -1961,47 +1959,31 @@ TEST_F(HostContentSettingsMapTest, FlashEphemeralPermissionSwitch) {
   map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                 CONTENT_SETTING_ASK);
 
-  for (int ephemeral = 0; ephemeral < 2; ephemeral++) {
-    base::test::ScopedFeatureList feature_list;
-    if (ephemeral) {
-      feature_list.InitAndEnableFeature(
-          content_settings::features::kEnableEphemeralFlashPermission);
-    } else {
-      feature_list.InitAndDisableFeature(
-          content_settings::features::kEnableEphemeralFlashPermission);
-    }
-    content_settings::ContentSettingsRegistry::GetInstance()->ResetForTest();
-
-    ReloadProviders(profile.GetPrefs(), map);
-    map->SetContentSettingDefaultScope(url, url, CONTENT_SETTINGS_TYPE_PLUGINS,
-                                       std::string(), CONTENT_SETTING_ALLOW);
-    EXPECT_EQ(CONTENT_SETTING_ALLOW,
-              map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_PLUGINS,
-                                     std::string()));
-
-    ReloadProviders(profile.GetPrefs(), map);
-    ContentSetting expectation =
-        ephemeral ? CONTENT_SETTING_ASK : CONTENT_SETTING_ALLOW;
-
-    EXPECT_EQ(expectation,
-              map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_PLUGINS,
-                                     std::string()))
-        << ephemeral;
-  }
+  base::test::ScopedFeatureList feature_list;
+  content_settings::ContentSettingsRegistry::GetInstance()->ResetForTest();
+
+  ReloadProviders(profile.GetPrefs(), map);
+  map->SetContentSettingDefaultScope(url, url, CONTENT_SETTINGS_TYPE_PLUGINS,
+                                     std::string(), CONTENT_SETTING_ALLOW);
+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
+            map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_PLUGINS,
+                                   std::string()));
+
+  ReloadProviders(profile.GetPrefs(), map);
+  EXPECT_EQ(CONTENT_SETTING_ASK,
+            map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_PLUGINS,
+                                   std::string()));
 }
 #endif  // !defined(OS_ANDROID)
 
-// Tests if restarting only removes ephemeral permissions.
-// kEnableEphemeralFlashPermission is not available on Android.
+// Tests that restarting only removes ephemeral permissions. Flash, and
+// consequently, Flash permissions are not available on Android.
 #if !defined(OS_ANDROID)
 TEST_F(HostContentSettingsMapTest, MixedEphemeralAndPersistentPermissions) {
   TestingProfile profile;
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
 
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      content_settings::features::kEnableEphemeralFlashPermission);
   content_settings::ContentSettingsRegistry::GetInstance()->ResetForTest();
   ReloadProviders(profile.GetPrefs(), map);
 
@@ -2052,18 +2034,15 @@ TEST_F(HostContentSettingsMapTest, MixedEphemeralAndPersistentPermissions) {
 }
 #endif  // !defined(OS_ANDROID)
 
-// Tests if directly writing a value to PrefProvider doesn't affect ephmeral
-// types.
-// kEnableEphemeralFlashPermission is not available on Android.
+// Test that directly writing a value to PrefProvider doesn't affect ephmeral
+// types. Flash, and consequently, Flash permissions are not available on
+// Android.
 #if !defined(OS_ANDROID)
 TEST_F(HostContentSettingsMapTest, EphemeralTypeDoesntReadFromPrefProvider) {
   TestingProfile profile;
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
 
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      content_settings::features::kEnableEphemeralFlashPermission);
   content_settings::ContentSettingsRegistry::GetInstance()->ResetForTest();
   ReloadProviders(profile.GetPrefs(), map);
 

chrome/browser/flag_descriptions.cc

@@ -479,12 +479,6 @@ const char kEnableCursorMotionBlurName[] = "Enable Cursor Motion Blur";
 const char kEnableCursorMotionBlurDescription[] =
     "Enable motion blur effect for the cursor.";
 
-const char kEnableEphemeralFlashPermissionName[] =
-    "Enable Ephemeral Flash Permissions";
-const char kEnableEphemeralFlashPermissionDescription[] =
-    "When enabled, Flash plugin permissions are reset at the end of the "
-    "browser session.";
-
 const char kEnableNoScriptPreviewsName[] = "NoScript previews";
 
 const char kEnableNoScriptPreviewsDescription[] =

chrome/browser/flag_descriptions.h

@@ -319,9 +319,6 @@ extern const char kEnableCSSFragmentIdentifiersDescription[];
 extern const char kEnableCursorMotionBlurName[];
 extern const char kEnableCursorMotionBlurDescription[];
 
-extern const char kEnableEphemeralFlashPermissionName[];
-extern const char kEnableEphemeralFlashPermissionDescription[];
-
 extern const char kEnableNoScriptPreviewsName[];
 extern const char kEnableNoScriptPreviewsDescription[];
 

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -410,12 +410,10 @@
       </template>
       <template is="dom-if" route-path="/content/flash" no-search>
         <settings-subpage page-title="$i18n{siteSettingsFlash}">
-          <template is="dom-if" if="[[enableEphemeralFlashPermission_]]">
-            <a class="settings-box first" tabindex="-1"
-                target="_blank">
-              $i18n{siteSettingsFlashPermissionsEphemeral}
-            </a>
-          </template>
+          <a class="settings-box first" tabindex="-1"
+              target="_blank">
+            $i18n{siteSettingsFlashPermissionsEphemeral}
+          </a>
           <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}"
               toggle-off-label="$i18n{siteSettingsFlashBlock}"
               toggle-on-label="$i18n{siteSettingsFlashAskFirstRecommended}">
@@ -432,8 +430,7 @@
 </if>
           <category-setting-exceptions
               category="{{ContentSettingsTypes.PLUGINS}}"
-              block-header="$i18n{siteSettingsBlock}"
-              read-only-list="[[enableEphemeralFlashPermission_]]">
+              block-header="$i18n{siteSettingsBlock}" read-only-list>
           </category-setting-exceptions>
         </settings-subpage>
       </template>

chrome/browser/resources/settings/privacy_page/privacy_page.js

@@ -162,14 +162,6 @@ Polymer({
       },
     },
 
-    /** @private */
-    enableEphemeralFlashPermission_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('enableEphemeralFlashPermission');
-      },
-    },
-
     // <if expr="not chromeos">
     /** @private */
     showRestart_: Boolean,

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -34,7 +34,6 @@
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_features.h"
 #include "components/browser_sync/profile_sync_service.h"
-#include "components/content_settings/core/common/features.h"
 #include "components/google/core/common/google_util.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/password_manager/core/common/password_manager_features.h"
@@ -2607,11 +2606,6 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
       "enablePaymentHandlerContentSetting",
       base::FeatureList::IsEnabled(features::kServiceWorkerPaymentApps));
 
-  html_source->AddBoolean(
-      "enableEphemeralFlashPermission",
-      base::FeatureList::IsEnabled(
-          content_settings::features::kEnableEphemeralFlashPermission));
-
   if (PluginUtils::ShouldPreferHtmlOverPlugins(
           HostContentSettingsMapFactory::GetForProfile(profile))) {
     LocalizedString flash_strings[] = {

components/content_settings/core/browser/content_settings_registry.cc

@@ -15,7 +15,6 @@
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/features.h"
 
 namespace content_settings {
 
@@ -150,19 +149,17 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            ContentSettingsInfo::PERSISTENT);
 
-  Register(
-      CONTENT_SETTINGS_TYPE_PLUGINS, "plugins",
-      CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, WebsiteSettingsInfo::SYNCABLE,
-      WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
-      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
-                    CONTENT_SETTING_ASK,
-                    CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),
-      WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,
-      WebsiteSettingsRegistry::DESKTOP,
-      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
-      base::FeatureList::IsEnabled(features::kEnableEphemeralFlashPermission)
-          ? ContentSettingsInfo::EPHEMERAL
-          : ContentSettingsInfo::PERSISTENT);
+  Register(CONTENT_SETTINGS_TYPE_PLUGINS, "plugins",
+           CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,
+           WebsiteSettingsInfo::SYNCABLE,
+           WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
+           ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
+                         CONTENT_SETTING_ASK,
+                         CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),
+           WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,
+           WebsiteSettingsRegistry::DESKTOP,
+           ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
+           ContentSettingsInfo::EPHEMERAL);
 
   Register(CONTENT_SETTINGS_TYPE_POPUPS, "popups", CONTENT_SETTING_BLOCK,
            WebsiteSettingsInfo::SYNCABLE,

components/content_settings/core/browser/host_content_settings_map.cc

@@ -35,7 +35,6 @@
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_utils.h"
-#include "components/content_settings/core/common/features.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
@@ -533,9 +532,7 @@ void HostContentSettingsMap::SetContentSettingCustomScope(
 
   // Record stats on Flash permission grants with ephemeral storage.
   if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
-      setting == CONTENT_SETTING_ALLOW &&
-      base::FeatureList::IsEnabled(
-          content_settings::features::kEnableEphemeralFlashPermission)) {
+      setting == CONTENT_SETTING_ALLOW) {
     GURL url(primary_pattern.ToString());
     ContentSettingsPattern temp_patterns[2];
     std::unique_ptr<base::Value> value(GetContentSettingValueAndPatterns(

components/content_settings/core/browser/website_settings_registry.cc

@@ -10,7 +10,6 @@
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/features.h"
 
 namespace {
 
@@ -181,17 +180,13 @@ void WebsiteSettingsRegistry::Init() {
            WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,
            DESKTOP | PLATFORM_ANDROID,
            WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO);
-  Register(
-      CONTENT_SETTINGS_TYPE_PLUGINS_DATA, "flash-data", nullptr,
-      // To counteract the reduced usability of the Flash permission
-      // when it becomes ephemeral, we sync the bit indicating that
-      // the Flash permission should be displayed in the page info.
-      base::FeatureList::IsEnabled(features::kEnableEphemeralFlashPermission)
-          ? WebsiteSettingsInfo::SYNCABLE
-          : WebsiteSettingsInfo::UNSYNCABLE,
-      WebsiteSettingsInfo::NOT_LOSSY,
-      WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,
-      DESKTOP, WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
+  // To counteract the reduced usability of the Flash permission when it becomes
+  // ephemeral, we sync the bit indicating that the Flash permission should be
+  // displayed in the page info.
+  Register(CONTENT_SETTINGS_TYPE_PLUGINS_DATA, "flash-data", nullptr,
+           WebsiteSettingsInfo::SYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
+           WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,
+           DESKTOP, WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
 }
 
 }  // namespace content_settings

components/content_settings/core/common/BUILD.gn

@@ -18,8 +18,6 @@ jumbo_static_library("common") {
     "content_settings_utils.h",
     "cookie_settings_base.cc",
     "cookie_settings_base.h",
-    "features.cc",
-    "features.h",
     "pref_names.cc",
     "pref_names.h",
   ]

components/content_settings/core/common/features.cc

-// Copyright 2018 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.
-
-// This file defines all the public base::FeatureList features for the chrome
-// module.
-
-#include "components/content_settings/core/common/features.h"
-
-namespace content_settings {
-namespace features {
-
-// Makes Flash plugin permissions persistent only through the current session.
-const base::Feature kEnableEphemeralFlashPermission{
-    "EnableEphemeralFlashPermission", base::FEATURE_ENABLED_BY_DEFAULT};
-
-}  // namespace features
-}  // namespace content_settings

components/content_settings/core/common/features.h

-// Copyright 2018 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.
-
-// This file defines all the public base::FeatureList features for the chrome
-// module.
-
-#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_FEATURES_H_
-#define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_FEATURES_H_
-
-#include "base/feature_list.h"
-
-namespace content_settings {
-namespace features {
-
-extern const base::Feature kEnableEphemeralFlashPermission;
-
-}  // namespace features
-}  // namespace content_settings
-
-#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_FEATURES_H_