Stop syncing content settings on Android

components/content_settings/core/browser/website_settings_registry.cc

 // Copyright 2015 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/browser/website_settings_registry.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 56 matching lines @@
     return nullptr;
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
   if (!(platform & PLATFORM_LINUX))
     return nullptr;
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   if (!(platform & PLATFORM_MAC))
     return nullptr;
 #elif defined(OS_CHROMEOS)
   if (!(platform & PLATFORM_CHROMEOS))
     return nullptr;
 #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"
 #endif
 
   WebsiteSettingsInfo* info = new WebsiteSettingsInfo(
       type, name, std::move(initial_default_value), sync_status, lossy_status,
       scoping_type, incognito_behavior);
   website_settings_info_[info->type()] = base::WrapUnique(info);
   return info;
@@ skipping 44 matching lines @@
            WebsiteSettingsInfo::DONT_INHERIT_IN_INCOGNITO);
   Register(CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
            "prompt-no-decision-count", nullptr, WebsiteSettingsInfo::UNSYNCABLE,
            WebsiteSettingsInfo::NOT_LOSSY,
            WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
            DESKTOP | PLATFORM_ANDROID,
            WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
 }
 
 }  // namespace content_settings