Refactor ActivityStatus to not store current activity

base/android/activity_status.cc

Index: base/android/activity_status.cc
diff --git a/base/android/activity_status.cc b/base/android/activity_status.cc
index 4d0be32ef93202a34b636916cf1e9fda640cdd8b..1b090ac121323c12cb04045a0e0de4025a888ce8 100644
--- a/base/android/activity_status.cc
+++ b/base/android/activity_status.cc
@@ -13,7 +13,7 @@ namespace base {
 namespace android {
 
 ActivityStatus::Listener::Listener(
-    const ActivityStatus::StateChangeCallback& callback)
+    const ActivityStatus::ApplicationStateChangeCallback& callback)
     : callback_(callback) {
   ActivityStatus::GetInstance()->RegisterListener(this);
 }
@@ -22,7 +22,7 @@ ActivityStatus::Listener::~Listener() {
   ActivityStatus::GetInstance()->UnregisterListener(this);
 }
 
-void ActivityStatus::Listener::Notify(ActivityState state) {
+void ActivityStatus::Listener::Notify(ApplicationState state) {
   callback_.Run(state);
 }
 
@@ -32,10 +32,12 @@ ActivityStatus* ActivityStatus::GetInstance() {
                    LeakySingletonTraits<ActivityStatus> >::get();
 }
 
-static void OnActivityStateChange(JNIEnv* env, jclass clazz, int new_state) {
+static void OnApplicationStateChange(JNIEnv* env,
+                                     jclass clazz,
+                                     jint new_state) {
   ActivityStatus* activity_status = ActivityStatus::GetInstance();
-  ActivityState activity_state = static_cast<ActivityState>(new_state);
-  activity_status->OnActivityStateChange(activity_state);
+  ApplicationState application_state = static_cast<ApplicationState>(new_state);
+  activity_status->OnApplicationStateChange(application_state);
 }
 
 bool ActivityStatus::RegisterBindings(JNIEnv* env) {
@@ -44,7 +46,7 @@ bool ActivityStatus::RegisterBindings(JNIEnv* env) {
 
 ActivityStatus::ActivityStatus()
     : observers_(new ObserverListThreadSafe<Listener>()) {
-  Java_ActivityStatus_registerThreadSafeNativeStateListener(
+  Java_ActivityStatus_registerThreadSafeNativeApplicationStateListener(
       base::android::AttachCurrentThread());
 }
 
@@ -58,8 +60,8 @@ void ActivityStatus::UnregisterListener(Listener* listener) {
   observers_->RemoveObserver(listener);
 }
 
-void ActivityStatus::OnActivityStateChange(ActivityState new_state) {
-  observers_->Notify(&ActivityStatus::Listener::Notify, new_state);
+void ActivityStatus::OnApplicationStateChange(ApplicationState state) {
+  observers_->Notify(&ActivityStatus::Listener::Notify, state);
 }
 
 }  // namespace android