Change type of MemoryCoordinatorImpl::ChildInfo::memory_state

content/browser/memory/memory_coordinator_impl.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_coordinator_impl.h"
 
 #include "base/memory/memory_coordinator_client_registry.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/process/process_handle.h"
 #include "base/process/process_metrics.h"
@@ skipping 177 matching lines @@
   std::unique_ptr<MemoryCoordinatorHandleImpl> handle(
       new MemoryCoordinatorHandleImpl(std::move(request), this,
                                       render_process_id));
   handle->binding().set_connection_error_handler(
       base::Bind(&MemoryCoordinatorImpl::OnConnectionError,
                  base::Unretained(this), render_process_id));
   CreateChildInfoMapEntry(render_process_id, std::move(handle));
 }
 
 bool MemoryCoordinatorImpl::SetChildMemoryState(int render_process_id,
-                                            mojom::MemoryState memory_state) {
+                                                MemoryState memory_state) {
   // Can't set an invalid memory state.
-  if (memory_state == mojom::MemoryState::UNKNOWN)
+  if (memory_state == MemoryState::UNKNOWN)
     return false;
 
   // Can't send a message to a child that doesn't exist.
   auto iter = children_.find(render_process_id);
   if (iter == children_.end())
     return false;
 
   // Can't send a message to a child that isn't bound.
   if (!iter->second.handle->child().is_bound())
     return false;
 
   memory_state = OverrideGlobalState(memory_state, iter->second);
 
   // A nop doesn't need to be sent, but is considered successful.
   if (iter->second.memory_state == memory_state)
     return true;
 
   // Can't suspend the given renderer.
-  if (memory_state == mojom::MemoryState::SUSPENDED &&
+  if (memory_state == MemoryState::SUSPENDED &&
       !CanSuspendRenderer(render_process_id))
     return false;
 
   // Update the internal state and send the message.
   iter->second.memory_state = memory_state;
-  iter->second.handle->child()->OnStateChange(memory_state);
+  iter->second.handle->child()->OnStateChange(ToMojomMemoryState(memory_state));
   return true;
 }
 
-mojom::MemoryState MemoryCoordinatorImpl::GetChildMemoryState(
+base::MemoryState MemoryCoordinatorImpl::GetChildMemoryState(
     int render_process_id) const {
   auto iter = children_.find(render_process_id);
   if (iter == children_.end())
-    return mojom::MemoryState::UNKNOWN;
+    return base::MemoryState::UNKNOWN;
   return iter->second.memory_state;
 }
 
 void MemoryCoordinatorImpl::RecordMemoryPressure(
     base::MemoryPressureMonitor::MemoryPressureLevel level) {
   DCHECK(GetGlobalMemoryState() != base::MemoryState::UNKNOWN);
   int state = static_cast<int>(GetGlobalMemoryState());
   switch (level) {
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE:
       UMA_HISTOGRAM_ENUMERATION(
@@ skipping 41 matching lines @@
                                     const NotificationDetails& details) {
   DCHECK(type == NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED);
   RenderWidgetHost* render_widget_host = Source<RenderWidgetHost>(source).ptr();
   RenderProcessHost* process = render_widget_host->GetProcess();
   if (!process)
     return;
   auto iter = children().find(process->GetID());
   if (iter == children().end())
     return;
   iter->second.is_visible = *Details<bool>(details).ptr();
-  auto new_state = ToMojomMemoryState(GetGlobalMemoryState());
+  auto new_state = GetGlobalMemoryState();
   SetChildMemoryState(iter->first, new_state);
 }
 
 bool MemoryCoordinatorImpl::ChangeStateIfNeeded(base::MemoryState prev_state,
                                                 base::MemoryState next_state) {
   DCHECK(CalledOnValidThread());
   if (prev_state == next_state)
     return false;
 
   base::TimeTicks prev_last_state_change = last_state_change_;
@@ skipping 32 matching lines @@
   auto* render_process_host = RenderProcessHost::FromID(render_process_id);
   if (!render_process_host || !render_process_host->IsProcessBackgrounded())
     return false;
   if (render_process_host->GetWorkerRefCount() > 0)
     return false;
   return delegate_->CanSuspendBackgroundedRenderer(render_process_id);
 }
 
 void MemoryCoordinatorImpl::OnChildAdded(int render_process_id) {
   // Populate the global state as an initial state of a newly created process.
-  auto new_state = ToMojomMemoryState(GetGlobalMemoryState());
+  auto new_state = GetGlobalMemoryState();
   SetChildMemoryState(render_process_id, new_state);
 }
 
-mojom::MemoryState MemoryCoordinatorImpl::OverrideGlobalState(
-    mojom::MemoryState memory_state,
+base::MemoryState MemoryCoordinatorImpl::OverrideGlobalState(
+    MemoryState memory_state,
     const ChildInfo& child) {
   // We don't suspend foreground renderers. Throttle them instead.
-  if (child.is_visible && memory_state == mojom::MemoryState::SUSPENDED)
-    return mojom::MemoryState::THROTTLED;
+  if (child.is_visible && memory_state == MemoryState::SUSPENDED)
+    return MemoryState::THROTTLED;
 #if defined(OS_ANDROID)
   // On Android, we throttle background renderers immediately.
   // TODO(bashi): Create a specialized class of MemoryCoordinator for Android
   // and move this ifdef to the class.
-  if (!child.is_visible && memory_state == mojom::MemoryState::NORMAL)
-    return mojom::MemoryState::THROTTLED;
+  if (!child.is_visible && memory_state == MemoryState::NORMAL)
+    return MemoryState::THROTTLED;
   // TODO(bashi): Suspend background renderers after a certain period of time.
 #endif  // defined(OS_ANDROID)
   return memory_state;
 }
 
 void MemoryCoordinatorImpl::SetDelegateForTesting(
     std::unique_ptr<MemoryCoordinatorDelegate> delegate) {
   CHECK(!delegate_);
   delegate_ = std::move(delegate);
 }
 
 void MemoryCoordinatorImpl::CreateChildInfoMapEntry(
     int render_process_id,
     std::unique_ptr<MemoryCoordinatorHandleImpl> handle) {
   auto& child_info = children_[render_process_id];
   // Process always start with normal memory state.
   // We'll set renderer's memory state to the current global state when the
   // corresponding renderer process is ready to communicate. Renderer processes
   // call AddChild() when they are ready.
-  child_info.memory_state = mojom::MemoryState::NORMAL;
+  child_info.memory_state = MemoryState::NORMAL;
   child_info.is_visible = true;
   child_info.handle = std::move(handle);
 }
 
 void MemoryCoordinatorImpl::NotifyStateToClients() {
   auto state = GetCurrentMemoryState();
   base::MemoryCoordinatorClientRegistry::GetInstance()->Notify(state);
 }
 
 void MemoryCoordinatorImpl::NotifyStateToChildren() {
-  auto mojo_state = ToMojomMemoryState(current_state_);
   // It's OK to call SetChildMemoryState() unconditionally because it checks
   // whether this state transition is valid.
   for (auto& iter : children())
-    SetChildMemoryState(iter.first, mojo_state);
+    SetChildMemoryState(iter.first, current_state_);
 }
 
 void MemoryCoordinatorImpl::RecordStateChange(MemoryState prev_state,
                                               MemoryState next_state,
                                               base::TimeDelta duration) {
   size_t total_private_kb = 0;
 
   // TODO(bashi): On MacOS we can't get process metrics for child processes and
   // therefore can't calculate the total private memory.
 #if !defined(OS_MACOSX)
@@ skipping 20 matching lines @@
 
 MemoryCoordinatorImpl::ChildInfo::ChildInfo() {}
 
 MemoryCoordinatorImpl::ChildInfo::ChildInfo(const ChildInfo& rhs) {
   // This is a nop, but exists for compatibility with STL containers.
 }
 
 MemoryCoordinatorImpl::ChildInfo::~ChildInfo() {}
 
 }  // namespace content