Drop the global memory state from memory coordinator

content/browser/memory/memory_state_updater.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_state_updater.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/browser/memory/memory_monitor.h"
@@ skipping 53 matching lines @@
     MemoryCoordinatorImpl* coordinator,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : coordinator_(coordinator), task_runner_(task_runner) {
   DCHECK(coordinator_);
   InitializeParameters();
   DCHECK(ValidateParameters());
 }
 
 MemoryStateUpdater::~MemoryStateUpdater() {}
 
-base::MemoryState MemoryStateUpdater::CalculateNextState() {
-  using MemoryState = base::MemoryState;
+void MemoryStateUpdater::ScheduleUpdateCondition(base::TimeDelta delta) {
+  update_condition_closure_.Reset(
+      base::Bind(&MemoryStateUpdater::UpdateCondition, base::Unretained(this)));
+  task_runner_->PostDelayedTask(FROM_HERE, update_condition_closure_.callback(),
+                                delta);
+}
 
+MemoryCondition MemoryStateUpdater::CalculateNextCondition() {
   int available =
       coordinator_->memory_monitor()->GetFreeMemoryUntilCriticalMB();
 
   // TODO(chrisha): Move this histogram recording to a better place when
   // https://codereview.chromium.org/2479673002/ is landed.
   UMA_HISTOGRAM_MEMORY_LARGE_MB("Memory.Coordinator.FreeMemoryUntilCritical",
                                 available);
 
   if (available <= 0)
-    return MemoryState::SUSPENDED;
+    return MemoryCondition::CRITICAL;
 
-  auto current_state = coordinator_->GetGlobalMemoryState();
+  auto current = coordinator_->GetMemoryCondtion();
   int expected_renderer_count = available / expected_renderer_size_;
 
-  switch (current_state) {
-    case MemoryState::NORMAL:
+  switch (current) {
+    case MemoryCondition::NORMAL:
       if (expected_renderer_count <= new_renderers_until_suspended_)
-        return MemoryState::SUSPENDED;
+        return MemoryCondition::CRITICAL;
       if (expected_renderer_count <= new_renderers_until_throttled_)
-        return MemoryState::THROTTLED;
-      return MemoryState::NORMAL;
-    case MemoryState::THROTTLED:
+        return MemoryCondition::WARNING;
+      return MemoryCondition::NORMAL;
+    case MemoryCondition::WARNING:
       if (expected_renderer_count <= new_renderers_until_suspended_)
-        return MemoryState::SUSPENDED;
+        return MemoryCondition::CRITICAL;
       if (expected_renderer_count >= new_renderers_back_to_normal_)
-        return MemoryState::NORMAL;
-      return MemoryState::THROTTLED;
-    case MemoryState::SUSPENDED:
+        return MemoryCondition::NORMAL;
+      return MemoryCondition::WARNING;
+    case MemoryCondition::CRITICAL:
       if (expected_renderer_count >= new_renderers_back_to_normal_)
-        return MemoryState::NORMAL;
+        return MemoryCondition::NORMAL;
       if (expected_renderer_count >= new_renderers_back_to_throttled_)
-        return MemoryState::THROTTLED;
-      return MemoryState::SUSPENDED;
-    case MemoryState::UNKNOWN:
-      // Fall through
-    default:
-      NOTREACHED();
-      return MemoryState::UNKNOWN;
+        return MemoryCondition::WARNING;
+      return MemoryCondition::CRITICAL;
   }
 }
 
-void MemoryStateUpdater::UpdateState() {
-  auto current_state = coordinator_->GetGlobalMemoryState();
-  auto next_state = CalculateNextState();
-  if (coordinator_->ChangeStateIfNeeded(current_state, next_state)) {
-    ScheduleUpdateState(minimum_transition_period_);
-  } else {
-    ScheduleUpdateState(monitoring_interval_);
-  }
-}
-
-void MemoryStateUpdater::ScheduleUpdateState(base::TimeDelta delta) {
-  update_state_closure_.Reset(base::Bind(&MemoryStateUpdater::UpdateState,
-                                         base::Unretained(this)));
-  task_runner_->PostDelayedTask(FROM_HERE, update_state_closure_.callback(),
-                                delta);
+void MemoryStateUpdater::UpdateCondition() {
+  auto next_condition = CalculateNextCondition();
+  coordinator_->UpdateConditionIfNeeded(next_condition);
+  ScheduleUpdateCondition(monitoring_interval_);
 }
 
 void MemoryStateUpdater::InitializeParameters() {
   expected_renderer_size_ = kDefaultExpectedRendererSizeMB;
   new_renderers_until_throttled_ = kDefaultNewRenderersUntilThrottled;
   new_renderers_until_suspended_ = kDefaultNewRenderersUntilSuspended;
   new_renderers_back_to_normal_ = kDefaultNewRenderersBackToNormal;
   new_renderers_back_to_throttled_ = kDefaultNewRenderersBackToThrottled;
   minimum_transition_period_ =
       base::TimeDelta::FromSeconds(kDefaultMinimumTransitionPeriodSeconds);
@@ skipping 21 matching lines @@
 }
 
 bool MemoryStateUpdater::ValidateParameters() {
   return (new_renderers_until_throttled_ > new_renderers_until_suspended_) &&
       (new_renderers_back_to_normal_ > new_renderers_back_to_throttled_) &&
       (new_renderers_back_to_normal_ > new_renderers_until_throttled_) &&
       (new_renderers_back_to_throttled_ > new_renderers_until_suspended_);
 }
 
 }  // namespace content