[Reland] Move AndroidSyncSettings strict mode exception to ChromeStrictMode.java

BUG=1137380

Change-Id: Ib1f8c60f598b001c51904767daf36ede0d1a349c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2481248Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819103}

chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java

@@ -211,6 +211,14 @@ public class ChromeStrictMode {
             threadInterceptor.ignoreExternalMethod(Violation.DETECT_DISK_READ,
                     "android.net.ConnectivityManager#registerDefaultNetworkCallback");
         }
+
+        // crbug.com/1133401
+        threadInterceptor.ignoreExternalMethod(
+                Violation.DETECT_DISK_IO, "android.content.ContentResolver#removePeriodicSync");
+        threadInterceptor.ignoreExternalMethod(
+                Violation.DETECT_DISK_IO, "android.content.ContentResolver#setIsSyncable");
+        threadInterceptor.ignoreExternalMethod(
+                Violation.DETECT_DISK_IO, "android.content.ContentResolver#setSyncAutomatically");
     }
 
     public static void addExemptions(ThreadStrictModeInterceptor.Builder threadInterceptor) {

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

@@ -16,7 +16,6 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
-import org.chromium.base.StrictModeContext;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -227,9 +226,7 @@ public class AndroidSyncSettings {
         if (value == mChromeSyncEnabled || mAccount == null) return;
         mChromeSyncEnabled = value;
 
-        try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
-            mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value);
-        }
+        mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value);
         notifyObservers();
     }
 
@@ -246,29 +243,24 @@ public class AndroidSyncSettings {
 
         mIsSyncable = shouldBeSyncable;
 
-        try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
-            // Make account syncable if there is one.
-            if (shouldBeSyncable) {
-                mSyncContentResolverDelegate.setIsSyncable(mAccount, mContractAuthority, 1);
-                // This reduces unnecessary resource usage. See http://crbug.com/480688 for details.
-                mSyncContentResolverDelegate.removePeriodicSync(
-                        mAccount, mContractAuthority, Bundle.EMPTY);
-            } else if (mAccount != null) {
-                mSyncContentResolverDelegate.setIsSyncable(mAccount, mContractAuthority, 0);
-            }
+        // Make account syncable if there is one.
+        if (shouldBeSyncable) {
+            mSyncContentResolverDelegate.setIsSyncable(mAccount, mContractAuthority, 1);
+            // This reduces unnecessary resource usage. See http://crbug.com/480688 for details.
+            mSyncContentResolverDelegate.removePeriodicSync(
+                    mAccount, mContractAuthority, Bundle.EMPTY);
+        } else if (mAccount != null) {
+            mSyncContentResolverDelegate.setIsSyncable(mAccount, mContractAuthority, 0);
         }
 
         // Disable the syncability of Chrome for all other accounts.
         AccountManagerFacadeProvider.getInstance().tryGetGoogleAccounts(accounts -> {
-            try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
-                for (Account account : accounts) {
-                    if (account.equals(mAccount)) continue;
-                    if (mSyncContentResolverDelegate.getIsSyncable(account, mContractAuthority)
-                            <= 0) {
-                        continue;
-                    }
-                    mSyncContentResolverDelegate.setIsSyncable(account, mContractAuthority, 0);
+            for (Account account : accounts) {
+                if (account.equals(mAccount)) continue;
+                if (mSyncContentResolverDelegate.getIsSyncable(account, mContractAuthority) <= 0) {
+                    continue;
                 }
+                mSyncContentResolverDelegate.setIsSyncable(account, mContractAuthority, 0);
             }
         });
     }
@@ -283,19 +275,16 @@ public class AndroidSyncSettings {
         boolean oldChromeSyncEnabled = mChromeSyncEnabled;
         boolean oldMasterSyncEnabled = mMasterSyncEnabled;
 
-        try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
-            if (mAccount != null) {
-                mIsSyncable =
-                        mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority)
-                        > 0;
-                mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically(
-                        mAccount, mContractAuthority);
-            } else {
-                mIsSyncable = false;
-                mChromeSyncEnabled = false;
-            }
-            mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically();
+        if (mAccount != null) {
+            mIsSyncable =
+                    mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority) > 0;
+            mChromeSyncEnabled =
+                    mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mContractAuthority);
+        } else {
+            mIsSyncable = false;
+            mChromeSyncEnabled = false;
         }
+        mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically();
 
         if (mAccount != null && ProfileSyncService.get() != null
                 && ChromeFeatureList.isEnabled(