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}

3 files changed, 0 insertions, 13 deletions

diff --git a/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java b/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
index ab424e5..c36cef4 100644
--- a/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
+++ b/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
@@ -8,7 +8,6 @@ import android.accounts.Account;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SyncStatusObserver;
-import android.os.Bundle;
 import android.os.StrictMode;
 
 import org.chromium.base.ObserverList;
@@ -222,9 +221,6 @@ public class AndroidSyncSettings {
         // 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);
         }
 
         // Disable the syncability of Chrome for all other accounts. Don't use
diff --git a/sync/android/java/src/org/chromium/sync/SyncContentResolverDelegate.java b/sync/android/java/src/org/chromium/sync/SyncContentResolverDelegate.java
index b5ea731..85ab19f 100644
--- a/sync/android/java/src/org/chromium/sync/SyncContentResolverDelegate.java
+++ b/sync/android/java/src/org/chromium/sync/SyncContentResolverDelegate.java
@@ -7,7 +7,6 @@ package org.chromium.sync;
 
 import android.accounts.Account;
 import android.content.SyncStatusObserver;
-import android.os.Bundle;
 
 /**
  * Since the ContentResolver in Android has a lot of static methods, it is hard to
@@ -31,6 +30,4 @@ public interface SyncContentResolverDelegate {
     void setIsSyncable(Account account, String authority, int syncable);
 
     int getIsSyncable(Account account, String authority);
-
-    void removePeriodicSync(Account account, String authority, Bundle extras);
 }
diff --git a/sync/android/java/src/org/chromium/sync/SystemSyncContentResolverDelegate.java b/sync/android/java/src/org/chromium/sync/SystemSyncContentResolverDelegate.java
index 6d790da..9e8cd7d 100644
--- a/sync/android/java/src/org/chromium/sync/SystemSyncContentResolverDelegate.java
+++ b/sync/android/java/src/org/chromium/sync/SystemSyncContentResolverDelegate.java
@@ -8,7 +8,6 @@ package org.chromium.sync;
 import android.accounts.Account;
 import android.content.ContentResolver;
 import android.content.SyncStatusObserver;
-import android.os.Bundle;
 
 /**
  * A SyncContentResolverDelegate that simply forwards calls to ContentResolver.
@@ -54,9 +53,4 @@ public class SystemSyncContentResolverDelegate implements SyncContentResolverDel
     public int getIsSyncable(Account account, String authority) {
         return ContentResolver.getIsSyncable(account, authority);
     }
-
-    @Override
-    public void removePeriodicSync(Account account, String authority, Bundle extras) {
-        ContentResolver.removePeriodicSync(account, authority, extras);
-    }
 }