Add sync prefs to persist decoupling of Sync from Android master sync

Per the plan laid out in the linked bug, we need to persist whether
the "natural decoupling" happened, i.e. this information must be kept
across browsing sessions. This CL adds a boolean sync pref for this and
exposes getter and setters for it all the way up to the Java code.

Bug: 1125622
Change-Id: Ibeea8745f45d65cf016dbe0b316bd48228f34b14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398524
Commit-Queue: Victor Vianna <victorvianna@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805706}

chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java

@@ -195,6 +195,16 @@ public class ProfileSyncService {
                 mNativeProfileSyncServiceAndroid, ProfileSyncService.this);
     }
 
+    public void setDecoupledFromAndroidMasterSync() {
+        ProfileSyncServiceJni.get().setDecoupledFromAndroidMasterSync(
+                mNativeProfileSyncServiceAndroid, ProfileSyncService.this);
+    }
+
+    public boolean getDecoupledFromAndroidMasterSync() {
+        return ProfileSyncServiceJni.get().getDecoupledFromAndroidMasterSync(
+                mNativeProfileSyncServiceAndroid, ProfileSyncService.this);
+    }
+
     /**
      * Gets the set of data types that are "preferred" in sync. Those are the
      * chosen ones (see getChosenDataTypes), plus any that are implied by them.
@@ -652,6 +662,10 @@ public class ProfileSyncService {
         int getAuthError(long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
         boolean requiresClientUpgrade(
                 long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
+        void setDecoupledFromAndroidMasterSync(
+                long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
+        boolean getDecoupledFromAndroidMasterSync(
+                long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
         boolean isEngineInitialized(
                 long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
         boolean isEncryptEverythingAllowed(

chrome/browser/sync/profile_sync_service_android.cc

@@ -392,6 +392,20 @@ jboolean ProfileSyncServiceAndroid::RequiresClientUpgrade(
   return sync_service_->RequiresClientUpgrade();
 }
 
+void ProfileSyncServiceAndroid::SetDecoupledFromAndroidMasterSync(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  sync_service_->SetDecoupledFromAndroidMasterSync();
+}
+
+jboolean ProfileSyncServiceAndroid::GetDecoupledFromAndroidMasterSync(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  return sync_service_->GetDecoupledFromAndroidMasterSync();
+}
+
 jboolean ProfileSyncServiceAndroid::IsPassphrasePrompted(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {

chrome/browser/sync/profile_sync_service_android.h

@@ -131,6 +131,12 @@ class ProfileSyncServiceAndroid : public syncer::SyncServiceObserver {
   jboolean RequiresClientUpgrade(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
+  void SetDecoupledFromAndroidMasterSync(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj);
+  jboolean GetDecoupledFromAndroidMasterSync(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj);
 
   // Pure SyncPrefs calls.
   jboolean IsPassphrasePrompted(

components/sync/base/pref_names.cc

@@ -45,7 +45,7 @@ const char kSyncAllOsTypes[] = "sync.all_os_types";
 // OS user selectable types.
 const char kSyncOsApps[] = "sync.os_apps";
 const char kSyncOsPreferences[] = "sync.os_preferences";
-#endif
+#endif  // defined(OS_CHROMEOS)
 
 // Booleans specifying whether the user has selected to sync the following
 // user selectable types.
@@ -134,6 +134,13 @@ const char kSyncDemographics_GenderPath[] = "gender";
 const char kSyncDemographicsBirthYearOffset[] =
     "sync.demographics_birth_year_offset";
 
+#if defined(OS_ANDROID)
+// Stores whether sync should no longer respect the state of master toggle for
+// this user.
+const char kSyncDecoupledFromAndroidMasterSync[] =
+    "sync.decoupled_from_master_sync";
+#endif  // defined(OS_ANDROID)
+
 }  // namespace prefs
 
 }  // namespace syncer

components/sync/base/pref_names.h

@@ -23,7 +23,7 @@ extern const char kOsSyncFeatureEnabled[];
 extern const char kSyncAllOsTypes[];
 extern const char kSyncOsApps[];
 extern const char kSyncOsPreferences[];
-#endif
+#endif  // defined(OS_CHROMEOS)
 
 extern const char kSyncApps[];
 extern const char kSyncAutofill[];
@@ -60,6 +60,10 @@ extern const char kLocalSyncBackendDir[];
 extern const char kSyncDemographics[];
 extern const char kSyncDemographicsBirthYearOffset[];
 
+#if defined(OS_ANDROID)
+extern const char kSyncDecoupledFromAndroidMasterSync[];
+#endif  // defined(OS_ANDROID)
+
 // These are not prefs, they are paths inside of kSyncDemographics.
 extern const char kSyncDemographics_BirthYearPath[];
 extern const char kSyncDemographics_GenderPath[];

components/sync/base/sync_prefs.cc

@@ -288,6 +288,10 @@ void SyncPrefs::RegisterProfilePrefs(
   registry->RegisterStringPref(prefs::kSyncLastRunVersion, std::string());
   registry->RegisterBooleanPref(prefs::kEnableLocalSyncBackend, false);
   registry->RegisterFilePathPref(prefs::kLocalSyncBackendDir, base::FilePath());
+#if defined(OS_ANDROID)
+  registry->RegisterBooleanPref(prefs::kSyncDecoupledFromAndroidMasterSync,
+                                false);
+#endif  // defined(OS_ANDROID)
 
   // Demographic prefs.
   registry->RegisterDictionaryPref(
@@ -341,6 +345,9 @@ void SyncPrefs::ClearLocalSyncTransportData() {
   pref_service_->ClearPref(prefs::kSyncCacheGuid);
   pref_service_->ClearPref(prefs::kSyncBirthday);
   pref_service_->ClearPref(prefs::kSyncBagOfChips);
+#if defined(OS_ANDROID)
+  pref_service_->ClearPref(prefs::kSyncDecoupledFromAndroidMasterSync);
+#endif  // defined(OS_ANDROID)
 
   // No need to clear kManaged, kEnableLocalSyncBackend or kLocalSyncBackendDir,
   // since they're never actually set as user preferences.
@@ -666,6 +673,18 @@ void SyncPrefs::SetPassphrasePrompted(bool value) {
   pref_service_->SetBoolean(prefs::kSyncPassphrasePrompted, value);
 }
 
+#if defined(OS_ANDROID)
+void SyncPrefs::SetDecoupledFromAndroidMasterSync() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  pref_service_->SetBoolean(prefs::kSyncDecoupledFromAndroidMasterSync, true);
+}
+
+bool SyncPrefs::GetDecoupledFromAndroidMasterSync() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  return pref_service_->GetBoolean(prefs::kSyncDecoupledFromAndroidMasterSync);
+}
+#endif  // defined(OS_ANDROID)
+
 void SyncPrefs::GetInvalidationVersions(
     std::map<ModelType, int64_t>* invalidation_versions) const {
   const base::DictionaryValue* invalidation_dictionary =

components/sync/base/sync_prefs.h

@@ -169,6 +169,17 @@ class SyncPrefs : public CryptoSyncPrefs,
   bool IsPassphrasePrompted() const;
   void SetPassphrasePrompted(bool value);
 
+#if defined(OS_ANDROID)
+  // Sets a boolean pref representing that Sync should no longer respect whether
+  // Android master sync is enabled/disabled.
+  void SetDecoupledFromAndroidMasterSync();
+
+  // Gets the value for the boolean pref representing whether Sync should no
+  // longer respect if Android master sync is enabled/disabled. Returns false
+  // until |SetDecoupledFromAndroidMasterSync()| is called.
+  bool GetDecoupledFromAndroidMasterSync();
+#endif  // defined(OS_ANDROID)
+
   // For testing.
   void SetManagedForTest(bool is_managed);
 

components/sync/driver/profile_sync_service.cc

@@ -1966,6 +1966,18 @@ void ProfileSyncService::SetPassphrasePrompted(bool prompted) {
   sync_prefs_.SetPassphrasePrompted(prompted);
 }
 
+#if defined(OS_ANDROID)
+void ProfileSyncService::SetDecoupledFromAndroidMasterSync() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  sync_prefs_.SetDecoupledFromAndroidMasterSync();
+}
+
+bool ProfileSyncService::GetDecoupledFromAndroidMasterSync() {
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+  return sync_prefs_.GetDecoupledFromAndroidMasterSync();
+}
+#endif  // defined(OS_ANDROID)
+
 SyncEncryptionHandler::Observer*
 ProfileSyncService::GetEncryptionObserverForTest() {
   return &crypto_;

components/sync/driver/profile_sync_service.h

@@ -19,6 +19,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "components/invalidation/public/identity_provider.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 #include "components/sync/base/model_type.h"
@@ -216,6 +217,16 @@ class ProfileSyncService : public SyncService,
   bool IsPassphrasePrompted() const;
   void SetPassphrasePrompted(bool prompted);
 
+#if defined(OS_ANDROID)
+  // Persists the fact that sync should no longer respect whether Android master
+  // sync is enabled. Only called on Android.
+  void SetDecoupledFromAndroidMasterSync();
+
+  // Gets the persisted information of whether sync should no longer respect
+  // if Android master sync is enabled. Only called on Android.
+  bool GetDecoupledFromAndroidMasterSync();
+#endif  // defined(OS_ANDROID)
+
   // Returns whether or not the underlying sync engine has made any
   // local changes to items that have not yet been synced with the
   // server.