Refactor ActivityStatus to not store current activity

base/android/activity_status_unittest.cc

Index: base/android/activity_status_unittest.cc
diff --git a/base/android/activity_status_unittest.cc b/base/android/activity_status_unittest.cc
index 3eb0d10f736264b21817a9d37afe018da3ac8c11..68efe65e862ab48cabd46be59c6755756e8971fc 100644
--- a/base/android/activity_status_unittest.cc
+++ b/base/android/activity_status_unittest.cc
@@ -20,11 +20,12 @@ namespace {
 
 using base::android::ScopedJavaLocalRef;
 
-// An invalid ActivityState value.
-const ActivityState kInvalidActivityState = static_cast<ActivityState>(100);
+// An invalid ApplicationState value.
+const ApplicationState kInvalidApplicationState =
+    static_cast<ApplicationState>(100);
 
 // Used to generate a callback that stores the new state at a given location.
-void StoreStateTo(ActivityState* target, ActivityState state) {
+void StoreStateTo(ApplicationState* target, ApplicationState state) {
   *target = state;
 }
 
@@ -40,7 +41,7 @@ class MultiThreadedTest {
  public:
   MultiThreadedTest()
       : activity_status_(ActivityStatus::GetInstance()),
-        state_(kInvalidActivityState),
+        state_(kInvalidApplicationState),
         event_(false, false),
         thread_("ActivityStatusTest thread"),
         main_() {
@@ -58,14 +59,14 @@ class MultiThreadedTest {
     event_.Wait();
 
     // Change state, then wait for the thread to modify state.
-    activity_status_->OnActivityStateChange(ACTIVITY_STATE_CREATED);
+    activity_status_->OnApplicationStateChange(APPLICATION_STATE_RUNNING);
     event_.Wait();
-    EXPECT_EQ(ACTIVITY_STATE_CREATED, state_);
+    EXPECT_EQ(APPLICATION_STATE_RUNNING, state_);
 
     // Again
-    activity_status_->OnActivityStateChange(ACTIVITY_STATE_DESTROYED);
+    activity_status_->OnApplicationStateChange(APPLICATION_STATE_DESTROYED);
     event_.Wait();
-    EXPECT_EQ(ACTIVITY_STATE_DESTROYED, state_);
+    EXPECT_EQ(APPLICATION_STATE_DESTROYED, state_);
   }
 
  private:
@@ -81,14 +82,14 @@ class MultiThreadedTest {
     event_.Signal();
   }
 
-  void StoreStateAndSignal(ActivityState state) {
+  void StoreStateAndSignal(ApplicationState state) {
     ExpectOnThread();
     state_ = state;
     event_.Signal();
   }
 
   ActivityStatus* const activity_status_;
-  ActivityState state_;
+  ApplicationState state_;
   base::WaitableEvent event_;
   base::Thread thread_;
   base::MessageLoop main_;
@@ -100,23 +101,23 @@ class MultiThreadedTest {
 TEST(ActivityStatusTest, SingleThread) {
   MessageLoop message_loop;
 
-  ActivityState result = kInvalidActivityState;
+  ApplicationState result = kInvalidApplicationState;
 
   // Create a new listener that stores the new state into |result| on every
   // state change.
   ActivityStatus::Listener listener(
       base::Bind(&StoreStateTo, base::Unretained(&result)));
 
-  EXPECT_EQ(kInvalidActivityState, result);
+  EXPECT_EQ(kInvalidApplicationState, result);
 
   ActivityStatus* const activity_status = ActivityStatus::GetInstance();
-  activity_status->OnActivityStateChange(ACTIVITY_STATE_CREATED);
+  activity_status->OnApplicationStateChange(APPLICATION_STATE_RUNNING);
   RunTasksUntilIdle();
-  EXPECT_EQ(ACTIVITY_STATE_CREATED, result);
+  EXPECT_EQ(APPLICATION_STATE_RUNNING, result);
 
-  activity_status->OnActivityStateChange(ACTIVITY_STATE_DESTROYED);
+  activity_status->OnApplicationStateChange(APPLICATION_STATE_DESTROYED);
   RunTasksUntilIdle();
-  EXPECT_EQ(ACTIVITY_STATE_DESTROYED, result);
+  EXPECT_EQ(APPLICATION_STATE_DESTROYED, result);
 }
 
 TEST(ActivityStatusTest, TwoThreads) {