Split the aggregate dictionary of content settings exceptions into per-type dictionaries

components/content_settings/core/common/content_settings.cc

 // Copyright (c) 2011 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 "components/content_settings/core/common/content_settings.h"
 
 #include "base/logging.h"
 
 ContentSetting IntToContentSetting(int content_setting) {
   return ((content_setting < 0) ||
@@ skipping 55 matching lines @@
 #endif
     case CONTENT_SETTINGS_TYPE_APP_BANNER:
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER;
     case CONTENT_SETTINGS_NUM_TYPES:
       return CONTENT_SETTINGS_TYPE_HISTOGRAM_INVALID;
   }
   NOTREACHED();
   return CONTENT_SETTINGS_TYPE_HISTOGRAM_INVALID;
 }
 
+bool IsContentSettingsTypeSyncable(ContentSettingsType content_setting) {
+  switch (content_setting) {
+    case CONTENT_SETTINGS_TYPE_COOKIES:
+    case CONTENT_SETTINGS_TYPE_IMAGES:
+    case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
+    case CONTENT_SETTINGS_TYPE_PLUGINS:
+    case CONTENT_SETTINGS_TYPE_POPUPS:
+    case CONTENT_SETTINGS_TYPE_FULLSCREEN:
+    case CONTENT_SETTINGS_TYPE_MOUSELOCK:
+    case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
+    case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
+    case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS:
+    case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
+    case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
+#if defined(OS_WIN)
+    case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
+#endif
+      return true;
+
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+    case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
+    case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
+    case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+    case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+#endif
+    case CONTENT_SETTINGS_TYPE_APP_BANNER:
+      return false;
+
+    default:

[raymes, 2015/04/01 06:51:20]

nit: do we need "default"? can we just put 
NOTREACHED();
return false;

outside the if-block

[msramek, 2015/04/01 09:34:26]

The compiler requires every option to be represented in the switch. We have
DEFAULT and NUM_TYPES left, and I considered it nicer to just lump them
together.

But now that I'm thinking about it, adding a new content settings will cause a
runtime error here (NOTREACHED()) as opposed to compile time error (missing
option in the switch), so it's probably better to be explicit.

[msramek, 2015/04/01 10:53:35]

Oh yes, but now trybots can't see that all options are really there and that
it's not possible not to reach "return".

+      NOTREACHED();
+      return false;
+  }
+}
+
 ContentSettingPatternSource::ContentSettingPatternSource(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSetting setting,
     const std::string& source,
     bool incognito)
     : primary_pattern(primary_pattern),
       secondary_pattern(secondary_pattern),
       setting(setting),
       source(source),
       incognito(incognito) {}
 
 ContentSettingPatternSource::ContentSettingPatternSource()
     : setting(CONTENT_SETTING_DEFAULT), incognito(false) {
 }
 
 RendererContentSettingRules::RendererContentSettingRules() {}
 
 RendererContentSettingRules::~RendererContentSettingRules() {}