Drop the global memory state from memory coordinator

content/browser/memory/memory_monitor_android.cc

 // Copyright 2016 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.
 
 #include "content/browser/memory/memory_monitor_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/memory/memory_coordinator_impl.h"
@@ skipping 58 matching lines @@
 const int kTrimMemoryRunningCritical = 15;
 
 // Called by JNI.
 static void OnTrimMemory(JNIEnv* env,
                          const base::android::JavaParamRef<jclass>& jcaller,
                          jint level) {
   DCHECK(level >= 0 && level <= kTrimMemoryLevelMax);
   auto* coordinator = MemoryCoordinatorImpl::GetInstance();
 
   if (level >= kTrimMemoryRunningCritical) {
-    coordinator->ForceSetGlobalState(base::MemoryState::SUSPENDED,
-                                     base::TimeDelta::FromMinutes(1));
+    coordinator->ForceSetMemoryCondition(MemoryCondition::WARNING,

[haraken, 2017/02/28 11:33:45]

Shouldn't this be CRITICAL?

[bashi, 2017/03/02 04:01:45]

Oops. Done. Thanks!

+                                         base::TimeDelta::FromMinutes(1));
   } else if (level >= kTrimMemoryRunningLow) {
-    coordinator->ForceSetGlobalState(base::MemoryState::THROTTLED,
-                                     base::TimeDelta::FromMinutes(1));
+    coordinator->ForceSetMemoryCondition(MemoryCondition::CRITICAL,

[haraken, 2017/02/28 11:33:45]

WARNING?

[bashi, 2017/03/02 04:01:45]

Done.

+                                         base::TimeDelta::FromMinutes(1));
   }
 }
 
 // static
 std::unique_ptr<MemoryMonitorAndroid> MemoryMonitorAndroid::Create() {
   auto delegate = base::WrapUnique(new MemoryMonitorAndroidDelegateImpl);
   return base::WrapUnique(new MemoryMonitorAndroid(std::move(delegate)));
 }
 
 // static
@@ skipping 18 matching lines @@
 void MemoryMonitorAndroid::GetMemoryInfo(MemoryInfo* out) {
   delegate_->GetMemoryInfo(out);
 }
 
 // Implementation of a factory function defined in memory_monitor.h.
 std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() {
   return MemoryMonitorAndroid::Create();
 }
 
 }  // namespace content