Revert of [Sync] Remove periodic sync for Chrome for Android (patchset #2 id:20001 of https://codereview.chromium.org/1148613002/)

Reason for revert:
seems to break the build
https://build.chromium.org/p/chromium/builders/Android/builds/40042

Original issue's description:
> [Sync] Remove periodic sync for Chrome for Android
>
> updateAccount() is always called on startup with the signed in account,
> so the removePeriodicSync() call will be hit even for already signed in
> users when the app restarts.
>
> BUG=480688
>
> Committed: https://crrev.com/20989a55f294c1b1643cbc2b80bf083de1dd7e36
> Cr-Commit-Position: refs/heads/master@{#330588}

TBR=nyquist@chromium.org,maxbogue@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=480688

Review URL: https://codereview.chromium.org/1135113006

Cr-Commit-Position: refs/heads/master@{#330592}

1 files changed, 0 insertions, 24 deletions

diff --git a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
index cb6fa9c..94e099b 100644
--- a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
@@ -6,7 +6,6 @@ package org.chromium.sync;
 
 import android.accounts.Account;
 import android.content.Context;
-import android.os.Bundle;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -30,7 +29,6 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
         private int mGetIsSyncableCalls;
         private int mSetIsSyncableCalls;
         private int mSetSyncAutomaticallyCalls;
-        private int mRemovePeriodicSyncCalls;
 
         @Override
         public boolean getMasterSyncAutomatically() {
@@ -61,12 +59,6 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
             mSetSyncAutomaticallyCalls++;
             super.setSyncAutomatically(account, authority, sync);
         }
-
-        @Override
-        public void removePeriodicSync(Account account, String authority, Bundle extras) {
-            mRemovePeriodicSyncCalls++;
-            super.removePeriodicSync(account, authority, extras);
-        }
     }
 
     private static class MockSyncSettingsObserver implements AndroidSyncSettingsObserver {
@@ -145,22 +137,6 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
 
     @SmallTest
     @Feature({"Sync"})
-    public void testAccountInitialization() throws InterruptedException {
-        // mAccount was set to be syncable and not have periodic syncs.
-        assertEquals(1, mSyncContentResolverDelegate.mSetIsSyncableCalls);
-        assertEquals(1, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
-        mAndroid.updateAccount(null);
-        // mAccount was set to be not syncable.
-        assertEquals(2, mSyncContentResolverDelegate.mSetIsSyncableCalls);
-        assertEquals(1, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
-        mAndroid.updateAccount(mAlternateAccount);
-        // mAlternateAccount was set to be syncable and not have periodic syncs.
-        assertEquals(3, mSyncContentResolverDelegate.mSetIsSyncableCalls);
-        assertEquals(2, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
     public void testToggleMasterSyncFromSettings() throws InterruptedException {
         mSyncContentResolverDelegate.setMasterSyncAutomatically(true);
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();