Move click-to-play to about:flags.

XIB changes: Add an outlet |pluginDefaultSettingMatrix_| to ContentSettingsDialogController, hooked up to the associated matrix, to remove the click-to-play radio button.

While I'm at it, clean up a bit:
* Remove the old --disable-click-to-play flag that reverted to the M6 behavior for blocked plugins
* Make ContentExceptionsWindowController use ContentSettingComboModel for the action popup.
* Make HostContentSettingsMapTest use AutoReset to reset command line switches.

BUG=62091
TEST=unit_tests

Review URL: http://codereview.chromium.org/4643007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65953 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc
index ec39a13..3606587 100644
--- a/chrome/browser/content_setting_combo_model.cc
+++ b/chrome/browser/content_setting_combo_model.cc
@@ -36,7 +36,8 @@ ContentSettingComboModel::~ContentSettingComboModel() {
 }
 
 int ContentSettingComboModel::GetItemCount() {
-  if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS)
+  if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableClickToPlay))
     return arraysize(kAskSettings);
   if (content_type_ == CONTENT_SETTINGS_TYPE_COOKIES)
     return arraysize(kSessionSettings);
@@ -60,7 +61,8 @@ string16 ContentSettingComboModel::GetItemAt(int index) {
 }
 
 ContentSetting ContentSettingComboModel::SettingForIndex(int index) {
-  if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS)
+  if (content_type_ == CONTENT_SETTINGS_TYPE_PLUGINS &&
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableClickToPlay))
     return kAskSettings[index];
   if (content_type_ == CONTENT_SETTINGS_TYPE_COOKIES)
     return kSessionSettings[index];