Call syncStateChanged for two set methods in FakeProfileSyncService

Methods from ProfileSyncService should be called from the UI thread.
However its subclass FakeProfileSyncService sets and gets some sync
states without checking if its on the UI thread or not.

This cl calls syncStateChanged inside setEngineInitialized() and
setPassphraseRequiredForPreferredDataTypes(). Also assert these set and
their corresponding isSet methods are run on UI thread.

Bug: 1056677
Change-Id: I2b41c88c054a1abe9591021abf3476d3b754b972
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080232
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752447}

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

@@ -345,8 +345,7 @@ public class ProfileSyncService {
      * UI elements can update themselves.
      */
     @CalledByNative
-    @VisibleForTesting
-    public void syncStateChanged() {
+    protected void syncStateChanged() {
         for (SyncStateChangedListener listener : mListeners) {
             listener.syncStateChanged();
         }

chrome/android/javatests/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBarTest.java

@@ -68,8 +68,7 @@ import java.io.IOException;
 
         // Resolving the error should not show the infobar again.
         deleteSyncErrorInfoBarShowTimePref();
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { mFakeProfileSyncService.setAuthError(GoogleServiceAuthError.State.NONE); });
+        mFakeProfileSyncService.setAuthError(GoogleServiceAuthError.State.NONE);
         InfoBarUtil.waitUntilNoInfoBarsExist(mSyncTestRule.getInfoBars());
     }
 
@@ -85,7 +84,6 @@ import java.io.IOException;
         deleteSyncErrorInfoBarShowTimePref();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mFakeProfileSyncService.setFirstSetupComplete(SyncFirstSetupCompleteSource.BASIC_FLOW);
-            mFakeProfileSyncService.syncStateChanged();
         });
         InfoBarUtil.waitUntilNoInfoBarsExist(mSyncTestRule.getInfoBars());
     }
@@ -100,10 +98,7 @@ import java.io.IOException;
 
         // Resolving the error should not show the infobar again.
         deleteSyncErrorInfoBarShowTimePref();
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mFakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(false);
-            mFakeProfileSyncService.syncStateChanged();
-        });
+        mFakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(false);
         InfoBarUtil.waitUntilNoInfoBarsExist(mSyncTestRule.getInfoBars());
     }
 
@@ -114,14 +109,13 @@ import java.io.IOException;
                 mSyncTestRule.getInfoBars().size());
         mSyncTestRule.setUpTestAccountAndSignIn();
         SyncTestUtil.waitForSyncActive();
+        mFakeProfileSyncService.setEngineInitialized(true);
+        mFakeProfileSyncService.setAuthError(GoogleServiceAuthError.State.NONE);
+        mFakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(false);
 
         @SyncError
         int syncError = TestThreadUtils.runOnUiThreadBlockingNoException(() -> {
-            mFakeProfileSyncService.setEngineInitialized(true);
-            mFakeProfileSyncService.setAuthError(GoogleServiceAuthError.State.NONE);
-            mFakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(false);
             mFakeProfileSyncService.setFirstSetupComplete(SyncFirstSetupCompleteSource.BASIC_FLOW);
-            mFakeProfileSyncService.syncStateChanged();
             return SyncSettingsUtils.getSyncError();
         });
         // syncError should not equal to any of these errors that trigger the infobar.
@@ -188,22 +182,14 @@ import java.io.IOException;
 
     private void showSyncErrorInfoBarForAuthError() {
         mSyncTestRule.setUpTestAccountAndSignIn();
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mFakeProfileSyncService.setAuthError(
-                    GoogleServiceAuthError.State.INVALID_GAIA_CREDENTIALS);
-        });
+        mFakeProfileSyncService.setAuthError(GoogleServiceAuthError.State.INVALID_GAIA_CREDENTIALS);
         mSyncTestRule.loadUrlInNewTab(UrlConstants.CHROME_BLANK_URL);
     }
 
     private void showSyncErrorInfoBarForPassphraseRequired() {
         mSyncTestRule.setUpTestAccountAndSignIn();
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            // TODO(https://crbug.com/1056677): call syncStateChanged inside
-            // setPassphraseRequiredForPreferredDataTypes
-            mFakeProfileSyncService.setEngineInitialized(true);
-            mFakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(true);
-            mFakeProfileSyncService.syncStateChanged();
-        });
+        mFakeProfileSyncService.setEngineInitialized(true);
+        mFakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(true);
         mSyncTestRule.loadUrlInNewTab(UrlConstants.CHROME_BLANK_URL);
     }
 

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

@@ -4,7 +4,10 @@
 
 package org.chromium.chrome.browser.sync;
 
+import androidx.annotation.AnyThread;
+
 import org.chromium.base.ThreadUtils;
+import org.chromium.content_public.browser.test.util.TestThreadUtils;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -32,11 +35,16 @@ public class FakeProfileSyncService extends ProfileSyncService {
 
     @Override
     public boolean isEngineInitialized() {
+        ThreadUtils.assertOnUiThread();
         return mEngineInitialized;
     }
 
+    @AnyThread
     public void setEngineInitialized(boolean engineInitialized) {
-        mEngineInitialized = engineInitialized;
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            mEngineInitialized = engineInitialized;
+            syncStateChanged();
+        });
     }
 
     @Override
@@ -45,10 +53,12 @@ public class FakeProfileSyncService extends ProfileSyncService {
         return mAuthError;
     }
 
+    @AnyThread
     public void setAuthError(@GoogleServiceAuthError.State int authError) {
-        ThreadUtils.assertOnUiThread();
-        mAuthError = authError;
-        syncStateChanged();
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            mAuthError = authError;
+            syncStateChanged();
+        });
     }
 
     @Override
@@ -77,12 +87,17 @@ public class FakeProfileSyncService extends ProfileSyncService {
 
     @Override
     public boolean isPassphraseRequiredForPreferredDataTypes() {
+        ThreadUtils.assertOnUiThread();
         return mPassphraseRequiredForPreferredDataTypes;
     }
 
+    @AnyThread
     public void setPassphraseRequiredForPreferredDataTypes(
             boolean passphraseRequiredForPreferredDataTypes) {
-        mPassphraseRequiredForPreferredDataTypes = passphraseRequiredForPreferredDataTypes;
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            mPassphraseRequiredForPreferredDataTypes = passphraseRequiredForPreferredDataTypes;
+            syncStateChanged();
+        });
     }
 
     @Override

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

@@ -149,7 +149,6 @@ public class ManageSyncSettingsWithFakeProfileSyncServiceTest {
         // PassphraseDialogFragment should be dismissed.
         fakeProfileSyncService.setPassphraseRequiredForPreferredDataTypes(false);
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            fakeProfileSyncService.syncStateChanged();
             fragment.getFragmentManager().executePendingTransactions();
             Assert.assertNull("PassphraseDialogFragment should be dismissed.",
                     mSettingsActivity.getFragmentManager().findFragmentByTag(

chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java

@@ -77,7 +77,6 @@ public class PassphraseActivityTest {
             // Fake sync's backend finishing its initialization.
             FakeProfileSyncService pss = (FakeProfileSyncService) ProfileSyncService.get();
             pss.setEngineInitialized(true);
-            pss.syncStateChanged();
         });
         // Nothing crashed; success!