Refactor ActivityStatus to not store current activity

chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
index d9b566713aead4f816ef98e1691ac52eba84092c..8fdca75eebb23b10160a9f52289d2dd3c36c0f88 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
@@ -18,7 +18,6 @@ import org.chromium.sync.notifier.InvalidationClientNameProvider;
 import org.chromium.sync.notifier.InvalidationIntentProtocol;
 import org.chromium.sync.notifier.InvalidationPreferences;
 import org.chromium.sync.notifier.InvalidationService;
-import org.chromium.sync.notifier.SyncStatusHelper;
 
 import java.util.Set;
 
@@ -26,7 +25,7 @@ import java.util.Set;
  * Controller used to send start, stop, and registration-change commands to the invalidation
  * client library used by Sync.
  */
-public class InvalidationController implements ActivityStatus.StateListener {
+public class InvalidationController implements ActivityStatus.ApplicationStateListener {
     private static final Object LOCK = new Object();
 
     private static InvalidationController sInstance;
@@ -119,17 +118,15 @@ public class InvalidationController implements ActivityStatus.StateListener {
     @VisibleForTesting
     InvalidationController(Context context) {
         mContext = Preconditions.checkNotNull(context.getApplicationContext());
-        ActivityStatus.registerStateListener(this);
+        ActivityStatus.registerApplicationStateListener(this);
     }
 
     @Override
-    public void onActivityStateChange(int newState) {
-        if (SyncStatusHelper.get(mContext).isSyncEnabled()) {

[bulach, 2014/02/17 12:04:01]

nit: what about this condition?

[David Trainor- moved to gerrit, 2014/02/18 19:54:15]

Ah messed this up in a rebase.  Will fix thanks.

-            if (newState == ActivityStatus.PAUSED) {
-                stop();
-            } else if (newState == ActivityStatus.RESUMED) {
-                start();
-            }
+    public void onApplicationStateChange(int newState) {
+        if (newState == ActivityStatus.HAS_RUNNING_ACTIVITIES) {
+            start();
+        } else if (newState == ActivityStatus.HAS_ONLY_PAUSED_ACTIVITIES) {
+            stop();
         }
     }