Refactor ActivityStatus to not store current activity

net/disk_cache/simple/simple_index.cc

-// Copyright (c) 2013 The Chromium Authors. All rights reserved.

[bulach, 2014/02/13 11:17:48]

trigger happy! :)

[David Trainor- moved to gerrit, 2014/02/14 19:13:36]

DELETE DELETE DELETE OMNOMNOM

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/disk_cache/simple/simple_index.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <utility>
 
@@ skipping 169 matching lines @@
         tokens.GetNext() &&
         base::StringToInt(tokens.token(), &background_delay)) {
       foreground_flush_delay_ = foreground_delay;
       background_flush_delay_ = background_delay;
     }
   }
 
 #if defined(OS_ANDROID)
   if (base::android::IsVMInitialized()) {
     activity_status_listener_.reset(new base::android::ActivityStatus::Listener(
-        base::Bind(&SimpleIndex::OnActivityStateChange, AsWeakPtr())));
+        base::Bind(&SimpleIndex::OnApplicationStateChange, AsWeakPtr())));
   }
 #endif
 
   SimpleIndexLoadResult* load_result = new SimpleIndexLoadResult();
   scoped_ptr<SimpleIndexLoadResult> load_result_scoped(load_result);
   base::Closure reply = base::Bind(
       &SimpleIndex::MergeInitializingSet,
       AsWeakPtr(),
       base::Passed(&load_result_scoped));
   index_file_->LoadIndexEntries(cache_mtime, reply, load_result);
@@ skipping 246 matching lines @@
                    to_run_when_initialized_.size(), 0, 100, 20);
   // Run all callbacks waiting for the index to come up.
   for (CallbackList::iterator it = to_run_when_initialized_.begin(),
        end = to_run_when_initialized_.end(); it != end; ++it) {
     io_thread_->PostTask(FROM_HERE, base::Bind((*it), net::OK));
   }
   to_run_when_initialized_.clear();
 }
 
 #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_RUNNING) {
     app_on_background_ = false;
-  } else if (state == base::android::ACTIVITY_STATE_STOPPED) {
+  } else if (state == base::android::APPLICATION_STATE_STOPPED) {
     app_on_background_ = true;
     WriteToDisk();
   }
 }
 #endif
 
 void SimpleIndex::WriteToDisk() {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   if (!initialized_)
     return;
@@ skipping 12 matching lines @@
                        start - last_write_to_disk_);
     }
   }
   last_write_to_disk_ = start;
 
   index_file_->WriteToDisk(entries_set_, cache_size_,
                            start, app_on_background_);
 }
 
 }  // namespace disk_cache