Stop pretending that a Flash setting of DETECT_IMPORTANT_CONTENT is ASK.

chrome/browser/ui/website_settings/website_settings_ui.cc

Index: chrome/browser/ui/website_settings/website_settings_ui.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 926d87dd1beb43a10a06ef892c6766f8ac4e3883..fda65fc69999908324080408412e2a66e034f798 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -248,14 +248,6 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(
       HostContentSettingsMapFactory::GetForProfile(profile);
   effective_setting = PluginsFieldTrial::EffectiveContentSetting(
       host_content_settings_map, type, effective_setting);
-
-  // Display the UI string for ASK instead of DETECT for HTML5 by Default.
-  // TODO(tommycli): Once HTML5 by Default is shipped and the feature flag
-  // is removed, just migrate the actual content setting to ASK.
-  if (PluginUtils::ShouldPreferHtmlOverPlugins(host_content_settings_map) &&
-      effective_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {
-    effective_setting = CONTENT_SETTING_ASK;
-  }
 #endif
 
   const int* button_text_ids = NULL;