Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based

chrome/browser/ui/website_settings/permission_menu_model.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/permission_menu_model.h"
 
-#include "chrome/browser/plugins/plugins_field_trial.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/content_settings/core/browser/plugins_field_trial.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionMenuModel::PermissionMenuModel(
     const GURL& url,
     const WebsiteSettingsUI::PermissionInfo& info,
     const ChangeCallback& callback)
     : ui::SimpleMenuModel(this), permission_(info), callback_(callback) {
   DCHECK(!callback_.is_null());
   base::string16 label;
 
   ContentSetting effective_default_setting = permission_.default_setting;
 
 #if defined(ENABLE_PLUGINS)
-  effective_default_setting = PluginsFieldTrial::EffectiveContentSetting(
-      permission_.type, permission_.default_setting);
+  effective_default_setting =
+      content_settings::PluginsFieldTrial::EffectiveContentSetting(
+          permission_.type, permission_.default_setting);
 #endif  // defined(ENABLE_PLUGINS)
 
   switch (effective_default_setting) {
     case CONTENT_SETTING_ALLOW:
       label = l10n_util::GetStringUTF16(
           IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW);
       break;
     case CONTENT_SETTING_BLOCK:
       label = l10n_util::GetStringUTF16(
           IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);
@@ skipping 58 matching lines @@
   AddCheckItem(CONTENT_SETTING_BLOCK,
                l10n_util::GetStringUTF16(IDS_PERMISSION_DENY));
 }
 
 PermissionMenuModel::~PermissionMenuModel() {}
 
 bool PermissionMenuModel::IsCommandIdChecked(int command_id) const {
   ContentSetting setting = permission_.setting;
 
 #if defined(ENABLE_PLUGINS)
-  setting = PluginsFieldTrial::EffectiveContentSetting(permission_.type,
-                                                       permission_.setting);
+  setting = content_settings::PluginsFieldTrial::EffectiveContentSetting(
+      permission_.type, permission_.setting);
 #endif  // defined(ENABLE_PLUGINS)
 
   return setting == command_id;
 }
 
 bool PermissionMenuModel::IsCommandIdEnabled(int command_id) const {
   return true;
 }
 
 bool PermissionMenuModel::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   // Accelerators are not supported.
   return false;
 }
 
 void PermissionMenuModel::ExecuteCommand(int command_id, int event_flags) {
   permission_.setting = static_cast<ContentSetting>(command_id);
   callback_.Run(permission_);
 }