Plugin Power Saver: Overhaul plugin-power-saver flags. Show in UI.

chrome/browser/ui/website_settings/website_settings_ui.cc

 // Copyright (c) 2012 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/ui/website_settings/website_settings_ui.h"
 
+#include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 const int kInvalidResourceID = -1;
@@ skipping 152 matching lines @@
   }
 }
 
 // static
 base::string16 WebsiteSettingsUI::PermissionActionToUIString(
     ContentSettingsType type,
     ContentSetting setting,
     ContentSetting default_setting,
     content_settings::SettingSource source) {
   ContentSetting effective_setting = setting;
-  if (effective_setting == CONTENT_SETTING_DEFAULT) {
+  if (effective_setting == CONTENT_SETTING_DEFAULT)
     effective_setting = default_setting;
 
-    // For Plugins, ASK is obsolete. Show as BLOCK to reflect actual behavior.
-    if (type == CONTENT_SETTINGS_TYPE_PLUGINS &&
-        default_setting == CONTENT_SETTING_ASK) {
-      effective_setting = CONTENT_SETTING_BLOCK;
-    }
-  }
+#if defined(ENABLE_PLUGINS)
+  effective_setting =
+      PluginsFieldTrial::EffectiveContentSetting(type, effective_setting);
+#endif
 
   const int* button_text_ids = NULL;
   switch (source) {
     case content_settings::SETTING_SOURCE_USER:
       if (setting == CONTENT_SETTING_DEFAULT)
         button_text_ids = kPermissionButtonTextIDDefaultSetting;
       else
         button_text_ids = kPermissionButtonTextIDUserManaged;
       break;
     case content_settings::SETTING_SOURCE_POLICY:
@@ skipping 161 matching lines @@
   // the first time.
   return IDR_PAGEINFO_INFO;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
     const base::string16& first_visit) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
 }