| Index: components/content_settings/core/common/content_settings.cc
|
| diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
|
| index 3a245e0133f30b2e51c681270405ab5d931cb013..5e38200208a771b5aed8adfa9e1b399eb3bbcaa6 100644
|
| --- a/components/content_settings/core/common/content_settings.cc
|
| +++ b/components/content_settings/core/common/content_settings.cc
|
| @@ -31,8 +31,8 @@ ContentSettingsType kHistogramOrder[] = {
|
| CONTENT_SETTINGS_TYPE_GEOLOCATION,
|
| CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
|
| CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
|
| - CONTENT_SETTINGS_TYPE_FULLSCREEN,
|
| - CONTENT_SETTINGS_TYPE_MOUSELOCK,
|
| + CONTENT_SETTINGS_TYPE_DEFAULT, // FULLSCREEN (removed).
|
| + CONTENT_SETTINGS_TYPE_DEFAULT, // MOUSELOCK (removed).
|
| CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
|
| CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed).
|
| CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
|
| @@ -43,7 +43,7 @@ ContentSettingsType kHistogramOrder[] = {
|
| CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
|
| CONTENT_SETTINGS_TYPE_DEFAULT, // PUSH_MESSAGING (removed).
|
| CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
|
| - CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (deprecated).
|
| + CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (removed).
|
| #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
| CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
|
| #else
|
|
|