Stop syncing content settings on Android

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 62ec02addc5670dde9220111e9e1131c1213b4ec..1d513986e74b4f87421655e8c1455d573f3193fd 100644
--- a/components/content_settings/core/browser/website_settings_registry.cc
+++ b/components/content_settings/core/browser/website_settings_registry.cc
@@ -77,13 +77,13 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Register(
 #elif defined(OS_ANDROID)

[msramek, 2016/08/31 08:48:06]

optional nit: We could join the two blocks (i.e. !(platform & (PLATFORM_ANDROID
| PLATFORM_IOS)) since the comment applies to both of them.

[raymes, 2016/09/01 00:17:01]

Hmm I think it's about the same to leave them separate, just because this code
is already a bit mind-bending with the platform check inside the ifdef platform
check :) I'll copy the comment though so it's clear.

   if (!(platform & PLATFORM_ANDROID))
     return nullptr;
+  // Don't sync settings to mobile platforms. The UI is different to desktop and
+  // doesn't allow the settings to be managed in the same way. See
+  // crbug.com/642184.
+  sync_status = WebsiteSettingsInfo::UNSYNCABLE;
 #elif defined(OS_IOS)
   if (!(platform & PLATFORM_IOS))
     return nullptr;
-  // Only default settings for Cookies and Popups are used in iOS. Exceptions
-  // and all the other content setting types are not used in iOS currently. So
-  // make content settings unsyncable on iOS for now.
-  // TODO(lshang): address this once we have proper content settings on iOS.
   sync_status = WebsiteSettingsInfo::UNSYNCABLE;
 #else
 #error "Unsupported platform"