Only Register() platform specific content settings types on different platforms

components/content_settings/core/browser/website_settings_registry.cc

Index: components/content_settings/core/browser/website_settings_registry.cc
diff --git a/components/content_settings/core/browser/website_settings_registry.cc b/components/content_settings/core/browser/website_settings_registry.cc
index f6eac0eff96d4c7cfa980259122912e143e2c70b..eda02cf8190a28e8c5e17ce863ed1017591b80f3 100644
--- a/components/content_settings/core/browser/website_settings_registry.cc
+++ b/components/content_settings/core/browser/website_settings_registry.cc
@@ -59,7 +59,30 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Register(
     WebsiteSettingsInfo::SyncStatus sync_status,
     WebsiteSettingsInfo::LossyStatus lossy_status,
     WebsiteSettingsInfo::ScopingType scoping_type,
+    uint32_t platform,
     WebsiteSettingsInfo::IncognitoBehavior incognito_behavior) {
+#if defined(OS_WIN)
+  if (!(platform & WebsiteSettingsInfo::PLATFORM_WINDOWS))
+    return nullptr;
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  if (!(platform & WebsiteSettingsInfo::PLATFORM_LINUX))
+    return nullptr;
+#elif defined(OS_MACOSX) && !defined(OS_IOS)
+  if (!(platform & WebsiteSettingsInfo::PLATFORM_MAC))
+    return nullptr;
+#elif defined(OS_CHROMEOS)
+  if (!(platform & WebsiteSettingsInfo::PLATFORM_CHROMEOS))
+    return nullptr;
+#elif defined(OS_ANDROID)
+  if (!(platform & WebsiteSettingsInfo::PLATFORM_ANDROID))
+    return nullptr;
+#elif defined(OS_IOS)
+  if (!(platform & WebsiteSettingsInfo::PLATFORM_IOS))
+    return nullptr;
+  // Make content settings unsyncable on ios.

[raymes, 2016/05/25 03:36:07]

nit: maybe expand on why we do this, because exceptions aren't used on ios so we
don't want other platforms exceptions to sync there.

[lshang, 2016/05/25 10:38:16]

Done.

+  sync_status = WebsiteSettingsInfo::UNSYNCABLE;
+#endif

[raymes, 2016/05/25 03:36:07]

Should we have:
#else
#error "Unsupported platform"
#endif

Otherwise we should have a default case but this might be better to make sure
there aren't cases we haven't thought about.

[lshang, 2016/05/25 10:38:16]

Done.

+
   WebsiteSettingsInfo* info = new WebsiteSettingsInfo(
       type, name, std::move(initial_default_value), sync_status, lossy_status,
       scoping_type, incognito_behavior);
@@ -88,23 +111,28 @@ void WebsiteSettingsRegistry::Init() {
            "auto-select-certificate", nullptr, WebsiteSettingsInfo::UNSYNCABLE,
            WebsiteSettingsInfo::NOT_LOSSY,
            WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE,
+           WebsiteSettingsInfo::ALL_PLATFORMS,
            WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
   Register(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions",
            nullptr, WebsiteSettingsInfo::UNSYNCABLE,
            WebsiteSettingsInfo::NOT_LOSSY,
            WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
+           WebsiteSettingsInfo::DESKTOP | WebsiteSettingsInfo::PLATFORM_ANDROID,
            WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
   Register(CONTENT_SETTINGS_TYPE_APP_BANNER, "app-banner", nullptr,
            WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,
            WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE,
+           WebsiteSettingsInfo::DESKTOP | WebsiteSettingsInfo::PLATFORM_ANDROID,
            WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
   Register(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, "site-engagement", nullptr,
            WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,
            WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
+           WebsiteSettingsInfo::DESKTOP | WebsiteSettingsInfo::PLATFORM_ANDROID,
            WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
   Register(CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, "usb-chooser-data", nullptr,
            WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
            WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,
+           WebsiteSettingsInfo::DESKTOP | WebsiteSettingsInfo::PLATFORM_ANDROID,
            WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO);
 }