Rename SyncStatusHelper to AndroidSyncSettings.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
index 3789275477c609378a94676c66d8c9f2d205337d..9a074c21c323d7387dbf79a3acbbd6eaa945b459 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
@@ -15,7 +15,7 @@ import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerat
 import org.chromium.chrome.browser.invalidation.InvalidationController;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInFlowObserver;
-import org.chromium.sync.notifier.SyncStatusHelper;
+import org.chromium.sync.AndroidSyncSettings;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
 
@@ -26,7 +26,7 @@ import org.chromium.sync.signin.ChromeSigninController;
  * the minimum additional functionality needed to fully enable sync for Chrome on Android.
  */
 public class SyncController implements ProfileSyncService.SyncStateChangedListener,
-        SyncStatusHelper.SyncSettingsChangedObserver {
+        AndroidSyncSettings.AndroidSyncSettingsObserver {
     private static final String TAG = "SyncController";
 
     private static final String SESSIONS_UUID_PREF_KEY = "chromium.sync.sessions.id";
@@ -35,14 +35,14 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen
 
     private final Context mContext;
     private final ChromeSigninController mChromeSigninController;
-    private final SyncStatusHelper mSyncStatusHelper;
+    private final AndroidSyncSettings mAndroidSyncSettings;
     private final ProfileSyncService mProfileSyncService;
 
     private SyncController(Context context) {
         mContext = context;
         mChromeSigninController = ChromeSigninController.get(mContext);
-        mSyncStatusHelper = SyncStatusHelper.get(context);
-        mSyncStatusHelper.registerSyncSettingsChangedObserver(this);
+        mAndroidSyncSettings = AndroidSyncSettings.get(context);
+        mAndroidSyncSettings.registerObserver(this);
         mProfileSyncService = ProfileSyncService.get(mContext);
         mProfileSyncService.addSyncStateChangedListener(this);
 
@@ -111,10 +111,7 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen
     }
 
     public void updateSyncStateFromAndroid() {
-        boolean masterSyncEnabled = mSyncStatusHelper.isMasterSyncAutomaticallyEnabled();
-        boolean chromeSyncEnabled = mSyncStatusHelper.isSyncEnabled();
-        Log.w(TAG, "updateSyncStateFromAndroid, master = " + masterSyncEnabled);
-        if (masterSyncEnabled && chromeSyncEnabled) {
+        if (mAndroidSyncSettings.isSyncEnabled()) {
             start();
         } else {
             stop();
@@ -123,12 +120,12 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen
 
     public void start() {
         ThreadUtils.assertOnUiThread();
-        if (mSyncStatusHelper.isMasterSyncAutomaticallyEnabled()) {
+        if (mAndroidSyncSettings.isMasterSyncEnabled()) {
             Log.d(TAG, "Enabling sync");
             Account account = mChromeSigninController.getSignedInUser();
             InvalidationController.get(mContext).start();
             mProfileSyncService.enableSync();
-            mSyncStatusHelper.enableAndroidSync(account);
+            mAndroidSyncSettings.enableChromeSync(account);
         }
     }
 
@@ -142,7 +139,7 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen
             Account account = mChromeSigninController.getSignedInUser();
             InvalidationController.get(mContext).stop();
             mProfileSyncService.disableSync();
-            mSyncStatusHelper.disableAndroidSync(account);
+            mAndroidSyncSettings.disableChromeSync(account);
         }
     }
 
@@ -159,18 +156,18 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen
         // Make the Java state match the native state.
         if (isSyncActive) {
             InvalidationController.get(mContext).start();
-            mSyncStatusHelper.enableAndroidSync(account);
+            mAndroidSyncSettings.enableChromeSync(account);
         } else {
             InvalidationController.get(mContext).stop();
-            mSyncStatusHelper.disableAndroidSync(account);
+            mAndroidSyncSettings.disableChromeSync(account);
         }
     }
 
     /**
-     * From {@link SyncStatusHelper.SyncSettingsChangedObserver}.
+     * From {@link AndroidSyncSettings.AndroidSyncSettingsObserver}.
      */
     @Override
-    public void syncSettingsChanged() {
+    public void androidSyncSettingsChanged() {
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {