Fix issue with sync status observer for testshell.

Also adds a test to ensure the sync status observer behaves correctly.

Depends on: https://codereview.chromium.org/23686014/

BUG=272584

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228237 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 2 deletions

diff --git a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
index 346639d..e1e8749 100644
--- a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
+++ b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
@@ -195,18 +195,36 @@ public class SyncStatusHelper {
      * Wrapper method for the ContentResolver.addStatusChangeListener(...) when we are only
      * interested in the settings type.
      */
-    public void registerContentResolverObserver(SyncSettingsChangedObserver observer) {
+    public void registerSyncSettingsChangedObserver(SyncSettingsChangedObserver observer) {
         mObservers.addObserver(observer);
     }
 
     /**
+     * This method is deprecated. Use
+     * {@link #registerSyncSettingsChangedObserver(SyncSettingsChangedObserver)}.
+     */
+    @Deprecated
+    public void registerContentResolverObserver(SyncSettingsChangedObserver observer) {
+        registerSyncSettingsChangedObserver(observer);
+    }
+
+    /**
      * Wrapper method for the ContentResolver.removeStatusChangeListener(...).
      */
-    public void unregisterContentResolverObserver(SyncSettingsChangedObserver observer) {
+    public void unregisterSyncSettingsChangedObserver(SyncSettingsChangedObserver observer) {
         mObservers.removeObserver(observer);
     }
 
     /**
+     * This method is deprecated. Use
+     * {@link #registerSyncSettingsChangedObserver(SyncSettingsChangedObserver)}.
+     */
+    @Deprecated
+    public void unregisterContentResolverObserver(SyncSettingsChangedObserver observer) {
+        unregisterSyncSettingsChangedObserver(observer);
+    }
+
+    /**
      * Checks whether sync is currently enabled from Chrome for a given account.
      *
      * It checks both the master sync for the device, and Chrome sync setting for the given account.