Refactor ActivityStatus to not store current activity

net/disk_cache/simple/simple_index.cc

Index: net/disk_cache/simple/simple_index.cc
diff --git a/net/disk_cache/simple/simple_index.cc b/net/disk_cache/simple/simple_index.cc
index dafc0e72177541e1bbdfcf43c636457d36336c88..1f316a59ed65d198ac732d7beb634089be54912e 100644
--- a/net/disk_cache/simple/simple_index.cc
+++ b/net/disk_cache/simple/simple_index.cc
@@ -187,8 +187,8 @@ void SimpleIndex::Initialize(base::Time cache_mtime) {
 
 #if defined(OS_ANDROID)
   if (base::android::IsVMInitialized()) {
-    activity_status_listener_.reset(new base::android::ActivityStatus::Listener(
-        base::Bind(&SimpleIndex::OnActivityStateChange, AsWeakPtr())));
+    app_status_listener_.reset(new base::android::ApplicationStatusListener(
+        base::Bind(&SimpleIndex::OnApplicationStateChange, AsWeakPtr())));
   }
 #endif
 
@@ -455,15 +455,15 @@ void SimpleIndex::MergeInitializingSet(
 }
 
 #if defined(OS_ANDROID)
-void SimpleIndex::OnActivityStateChange(
-    base::android::ActivityState state) {
+void SimpleIndex::OnApplicationStateChange(
+    base::android::ApplicationState state) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   // For more info about android activities, see:
   // developer.android.com/training/basics/activity-lifecycle/pausing.html
-  // These values are defined in the file ActivityStatus.java
-  if (state == base::android::ACTIVITY_STATE_RESUMED) {
+  if (state == base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) {

[pasko, 2014/02/24 14:43:31]

app_on_background_ should be set to false when HAS_PAUSED_ACTIVITIES because in
this case we are still on foreground. This would match hasVisibleActivities().

I have a more general question: why do we ever need to subscribe to
onPause()/onResume() in chrome?

     app_on_background_ = false;
-  } else if (state == base::android::ACTIVITY_STATE_STOPPED) {
+  } else if (state ==
+      base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES) {
     app_on_background_ = true;
     WriteToDisk();
   }