Refactor ActivityStatus to not store current activity

chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.invalidation;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ skipping 61 matching lines @@
         assertEquals(1, intent.getExtras().size());
         assertTrue(intent.hasExtra(InvalidationIntentProtocol.EXTRA_STOP));
         assertTrue(intent.getBooleanExtra(InvalidationIntentProtocol.EXTRA_STOP, false));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testResumingMainActivity() throws Exception {
         // Resuming main activity should trigger a start if sync is enabled.
         setupSync(true);
-        mController.onActivityStateChange(ActivityStatus.RESUMED);
+        mController.onApplicationStateChange(ActivityStatus.HAS_RUNNING_ACTIVITIES);
         assertEquals(1, mContext.getNumStartedIntents());
         Intent intent = mContext.getStartedIntent(0);
         validateIntentComponent(intent);
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testResumingMainActivityWithSyncDisabled() throws Exception {
         // Resuming main activity should NOT trigger a start if sync is disabled.
         setupSync(false);
-        mController.onActivityStateChange(ActivityStatus.RESUMED);
+        mController.onApplicationStateChange(ActivityStatus.HAS_RUNNING_ACTIVITIES);
         assertEquals(0, mContext.getNumStartedIntents());
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testPausingMainActivity() throws Exception {
         // Resuming main activity should trigger a stop if sync is enabled.
         setupSync(true);
-        mController.onActivityStateChange(ActivityStatus.PAUSED);
+        mController.onApplicationStateChange(ActivityStatus.HAS_ONLY_PAUSED_ACTIVITIES);
         assertEquals(1, mContext.getNumStartedIntents());
         Intent intent = mContext.getStartedIntent(0);
         validateIntentComponent(intent);
         assertEquals(1, intent.getExtras().size());
         assertTrue(intent.hasExtra(InvalidationIntentProtocol.EXTRA_STOP));
         assertTrue(intent.getBooleanExtra(InvalidationIntentProtocol.EXTRA_STOP, false));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testPausingMainActivityWithSyncDisabled() throws Exception {
         // Resuming main activity should NOT trigger a stop if sync is disabled.
         setupSync(false);
-        mController.onActivityStateChange(ActivityStatus.PAUSED);
+        mController.onApplicationStateChange(ActivityStatus.HAS_ONLY_PAUSED_ACTIVITIES);
         assertEquals(0, mContext.getNumStartedIntents());
     }
 
     private void setupSync(boolean syncEnabled) {
         Account account = AccountManagerHelper.createAccountFromName("test@gmail.com");
         ChromeSigninController chromeSigninController = ChromeSigninController.get(mContext);
         chromeSigninController.setSignedInAccountName(account.name);
         SyncStatusHelper syncStatusHelper = SyncStatusHelper.get(mContext);
         if (syncEnabled) {
             syncStatusHelper.enableAndroidSync(account);
         } else {
             syncStatusHelper.disableAndroidSync(account);
         }
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testEnsureConstructorRegistersListener() throws Exception {
         final AtomicBoolean listenerCallbackCalled = new AtomicBoolean();
 
         // Create instance.
         new InvalidationController(mContext) {
             @Override
-            public void onActivityStateChange(int newState) {
+            public void onApplicationStateChange(int newState) {
                 listenerCallbackCalled.set(true);
             }
         };
 
         // Ensure initial state is correct.
         assertFalse(listenerCallbackCalled.get());
 
         // Ensure we get a callback, which means we have registered for them.
         ActivityStatus.onStateChangeForTesting(new Activity(), ActivityStatus.RESUMED);
         assertTrue(listenerCallbackCalled.get());
@@ skipping 192 matching lines @@
             return startedIntents.get(idx);
         }
 
         @Override
         public PackageManager getPackageManager() {
             return getBaseContext().getPackageManager();
         }
     }
 
 }