[sync] Convert PSS.{requestStart,requestStop}() into setSyncRequested()

This CL brings the java version of ProfileSyncService closer to the
native one by merging the requestStart() and requestStop() methods into
a single setSyncRequested() one. No behavior is changed.

Bug: 985290
Change-Id: I56700c65ec5ee9152eee4bc21603802fc0ef7962
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592806
Auto-Submit: Victor Vianna <victorvianna@google.com>
Commit-Queue: Jan Krcal <jkrcal@chromium.org>
Reviewed-by: Jan Krcal <jkrcal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837961}

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

@@ -290,14 +290,9 @@ public class ProfileSyncService {
                 mNativeProfileSyncServiceAndroid, ProfileSyncService.this);
     }
 
-    public void requestStart() {
-        ProfileSyncServiceJni.get().requestStart(
-                mNativeProfileSyncServiceAndroid, ProfileSyncService.this);
-    }
-
-    public void requestStop() {
-        ProfileSyncServiceJni.get().requestStop(
-                mNativeProfileSyncServiceAndroid, ProfileSyncService.this);
+    public void setSyncRequested(boolean requested) {
+        ProfileSyncServiceJni.get().setSyncRequested(
+                mNativeProfileSyncServiceAndroid, ProfileSyncService.this, requested);
     }
 
     /**
@@ -653,8 +648,8 @@ public class ProfileSyncService {
     interface Natives {
         long init(ProfileSyncService caller);
 
-        void requestStart(long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
-        void requestStop(long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
+        void setSyncRequested(
+                long nativeProfileSyncServiceAndroid, ProfileSyncService caller, boolean requested);
         boolean isSyncAllowedByPlatform(
                 long nativeProfileSyncServiceAndroid, ProfileSyncService caller);
         void setSyncAllowedByPlatform(

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

@@ -103,7 +103,7 @@ public class SyncController
 
         if (isSyncEnabledInAndroidSyncSettings() == mProfileSyncService.isSyncRequested()) return;
         if (isSyncEnabledInAndroidSyncSettings()) {
-            mProfileSyncService.requestStart();
+            mProfileSyncService.setSyncRequested(true);
             return;
         }
 
@@ -124,7 +124,7 @@ public class SyncController
                         "Sync.StopSource", source, StopSource.STOP_SOURCE_LIMIT);
             }
 
-            mProfileSyncService.requestStop();
+            mProfileSyncService.setSyncRequested(false);
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java

@@ -396,9 +396,9 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
             boolean atLeastOneDataTypeEnabled =
                     mSyncEverything.isChecked() || selectedModelTypes.size() > 0;
             if (mProfileSyncService.isSyncRequested() && !atLeastOneDataTypeEnabled) {
-                mProfileSyncService.requestStop();
+                mProfileSyncService.setSyncRequested(false);
             } else if (!mProfileSyncService.isSyncRequested() && atLeastOneDataTypeEnabled) {
-                mProfileSyncService.requestStart();
+                mProfileSyncService.setSyncRequested(true);
             }
         }
 
@@ -713,7 +713,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
                         this, primaryAccountInfo, REQUEST_CODE_TRUSTED_VAULT_KEY_RETRIEVAL);
                 return;
             case SyncError.SYNC_SETUP_INCOMPLETE:
-                mProfileSyncService.requestStart();
+                mProfileSyncService.setSyncRequested(true);
                 mProfileSyncService.setFirstSetupComplete(
                         SyncFirstSetupCompleteSource.ADVANCED_FLOW_INTERRUPTED_TURN_SYNC_ON);
                 return;

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java

@@ -324,11 +324,11 @@ public class SyncSettingsUtils {
         if (enable == profileSyncService.isSyncRequested()) return;
 
         if (enable) {
-            profileSyncService.requestStart();
+            profileSyncService.setSyncRequested(true);
         } else {
             RecordHistogram.recordEnumeratedHistogram("Sync.StopSource",
                     StopSource.CHROME_SYNC_SETTINGS, StopSource.STOP_SOURCE_LIMIT);
-            profileSyncService.requestStop();
+            profileSyncService.setSyncRequested(false);
         }
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java

@@ -142,7 +142,7 @@ public class SyncTestRule extends ChromeTabbedActivityTestRule {
 
     private void ruleTearDown() {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mProfileSyncService.requestStop();
+            mProfileSyncService.setSyncRequested(false);
             FakeServerHelper.deleteFakeServer();
         });
         ProfileSyncService.resetForTests();
@@ -234,7 +234,8 @@ public class SyncTestRule extends ChromeTabbedActivityTestRule {
     }
 
     public void startSync() {
-        TestThreadUtils.runOnUiThreadBlocking(() -> { mProfileSyncService.requestStart(); });
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { mProfileSyncService.setSyncRequested(true); });
     }
 
     public void startSyncAndWait() {
@@ -243,7 +244,8 @@ public class SyncTestRule extends ChromeTabbedActivityTestRule {
     }
 
     public void stopSync() {
-        TestThreadUtils.runOnUiThreadBlocking(() -> { mProfileSyncService.requestStop(); });
+        TestThreadUtils.runOnUiThreadBlocking(
+                () -> { mProfileSyncService.setSyncRequested(false); });
         InstrumentationRegistry.getInstrumentation().waitForIdleSync();
     }
 

chrome/browser/sync/profile_sync_service_android.cc

@@ -131,16 +131,11 @@ jboolean ProfileSyncServiceAndroid::CanSyncFeatureStart(
   return sync_service_->CanSyncFeatureStart();
 }
 
-void ProfileSyncServiceAndroid::RequestStart(JNIEnv* env,
-                                             const JavaParamRef<jobject>&) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  sync_service_->GetUserSettings()->SetSyncRequested(true);
-}
-
-void ProfileSyncServiceAndroid::RequestStop(JNIEnv* env,
-                                            const JavaParamRef<jobject>&) {
+void ProfileSyncServiceAndroid::SetSyncRequested(JNIEnv* env,
+                                                 const JavaParamRef<jobject>&,
+                                                 jboolean requested) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  sync_service_->GetUserSettings()->SetSyncRequested(false);
+  sync_service_->GetUserSettings()->SetSyncRequested(requested);
 }
 
 jboolean ProfileSyncServiceAndroid::IsSyncAllowedByPlatform(

chrome/browser/sync/profile_sync_service_android.h

@@ -39,12 +39,11 @@ class ProfileSyncServiceAndroid : public syncer::SyncServiceObserver {
   // Pure ProfileSyncService calls.
   jboolean IsSyncRequested(JNIEnv* env,
                            const base::android::JavaParamRef<jobject>& obj);
+  void SetSyncRequested(JNIEnv* env,
+                        const base::android::JavaParamRef<jobject>& obj,
+                        jboolean requested);
   jboolean CanSyncFeatureStart(JNIEnv* env,
                                const base::android::JavaParamRef<jobject>& obj);
-  void RequestStart(JNIEnv* env,
-                    const base::android::JavaParamRef<jobject>& obj);
-  void RequestStop(JNIEnv* env,
-                   const base::android::JavaParamRef<jobject>& obj);
   jboolean IsSyncAllowedByPlatform(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);