Move the mixed scripting infobar to a page action icon / content setting.

chrome/browser/content_settings/content_settings_default_provider.cc

Index: chrome/browser/content_settings/content_settings_default_provider.cc
===================================================================
--- chrome/browser/content_settings/content_settings_default_provider.cc	(revision 142907)
+++ chrome/browser/content_settings/content_settings_default_provider.cc	(working copy)
@@ -43,6 +43,7 @@
   CONTENT_SETTING_DEFAULT,  // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE
   CONTENT_SETTING_ASK,      // CONTENT_SETTINGS_TYPE_FULLSCREEN
   CONTENT_SETTING_ASK,      // CONTENT_SETTINGS_TYPE_MOUSELOCK
+  CONTENT_SETTING_BLOCK,    // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT

[Bernhard Bauer, 2012/06/20 17:01:43]

Do we have something in place that DCHECKs that we're not trying to set or read
content settings for this type? For example, there is a method
HostContentSettingsMap::IsValidSettingForType() that could always return false
for this type, and you could set the default value to _DEFAULT (which means "no
value", and is automatically DCHECKed when reading content settings).

 };
 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
                default_settings_incorrect_size);
@@ -157,6 +158,11 @@
       ValueToContentSetting(
           default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()),
       CONTENT_SETTING_NUM_SETTINGS);
+  UMA_HISTOGRAM_ENUMERATION(
+      "ContentSettings.DefaultMixedScriptSetting",

[Bernhard Bauer, 2012/06/20 17:01:43]

Is this value user-changeable? I thought the setting above is only to make the
compiler assertion work, in which case we don't need UMA stats here.

+      ValueToContentSetting(
+          default_settings_[CONTENT_SETTINGS_TYPE_MIXEDSCRIPT].get()),
+      CONTENT_SETTING_NUM_SETTINGS);
 
   pref_change_registrar_.Init(prefs_);
   pref_change_registrar_.Add(prefs::kDefaultContentSettings, this);