| Index: chrome/browser/memory/tab_manager_delegate_chromeos.cc
|
| diff --git a/chrome/browser/memory/tab_manager_delegate_chromeos.cc b/chrome/browser/memory/tab_manager_delegate_chromeos.cc
|
| index 3cd077f2c6b7f78c59ce9575508db4173953cfff..a0184f1a06d523b254d2b622aadf3abd8d4c6942 100644
|
| --- a/chrome/browser/memory/tab_manager_delegate_chromeos.cc
|
| +++ b/chrome/browser/memory/tab_manager_delegate_chromeos.cc
|
| @@ -134,10 +134,11 @@ void TabManagerDelegate::OnProcessInstanceReady() {
|
| arc_process_instance_ = arc_bridge_service->process_instance();
|
| arc_process_instance_version_ = arc_bridge_service->process_version();
|
|
|
| + DCHECK(arc_process_instance_);
|
| +
|
| if (!IsArcMemoryManagementEnabled())
|
| return;
|
|
|
| - DCHECK(arc_process_instance_);
|
| if (arc_process_instance_version_ < 2) {
|
| VLOG(1) << "arc::ProcessInstance version < 2 does not "
|
| "support DisableBuiltinOomAdjustment() yet.";
|
| @@ -146,6 +147,13 @@ void TabManagerDelegate::OnProcessInstanceReady() {
|
| // If --enable-arc-memory-management is on, stop Android system-wide
|
| // oom_adj adjustment since this class will take over oom_score_adj settings.
|
| arc_process_instance_->DisableBuiltinOomAdjustment();
|
| +
|
| + if (arc_process_instance_version_ < 3) {
|
| + VLOG(1) << "arc::ProcessInstance version < 3 does not "
|
| + "support DisableLowMemoryKiller() yet.";
|
| + return;
|
| + }
|
| + arc_process_instance_->DisableLowMemoryKiller();
|
| }
|
|
|
| void TabManagerDelegate::OnProcessInstanceClosed() {
|
|
|