| 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 99763151477aaa27bcf176feb6aec4c5ba8294a8..482efe35c44111ba25b9837e121bd96f85e14e03 100644
|
| --- a/chrome/browser/memory/tab_manager_delegate_chromeos.cc
|
| +++ b/chrome/browser/memory/tab_manager_delegate_chromeos.cc
|
| @@ -143,8 +143,8 @@ bool IsArcMemoryManagementEnabled() {
|
| std::ostream& operator<<(
|
| std::ostream& out, const TabManagerDelegate::Candidate& candidate) {
|
| if (candidate.is_arc_app) {
|
| - out << "app " << candidate.app->pid
|
| - << " (" << candidate.app->process_name << ")";
|
| + out << "app " << candidate.app->pid()
|
| + << " (" << candidate.app->process_name() << ")";
|
| } else {
|
| out << "tab " << candidate.tab->renderer_handle;
|
| }
|
| @@ -613,7 +613,7 @@ TabManagerDelegate::GetSortedCandidates(
|
| }
|
|
|
| for (const auto& app : arc_processes) {
|
| - Candidate candidate(&app, AppStateToPriority(app.process_state));
|
| + Candidate candidate(&app, AppStateToPriority(app.process_state()));
|
| // Skip persistent android processes since we should never kill them.
|
| // Also don't ajust OOM score so their score remains min oom_score_adj.
|
| if (candidate.priority >= ProcessPriority::ANDROID_PERSISTENT)
|
| @@ -664,8 +664,8 @@ void TabManagerDelegate::LowMemoryKillImpl(
|
| }
|
| if (entry.is_arc_app) {
|
| int estimated_memory_freed_kb =
|
| - mem_stat_->EstimatedMemoryFreedKB(entry.app->pid);
|
| - if (KillArcProcess(entry.app->nspid)) {
|
| + mem_stat_->EstimatedMemoryFreedKB(entry.app->pid());
|
| + if (KillArcProcess(entry.app->nspid())) {
|
| target_memory_to_free_kb -= estimated_memory_freed_kb;
|
| uma_->ReportKill(estimated_memory_freed_kb);
|
| VLOG(2) << "Killed " << entry;
|
| @@ -782,15 +782,15 @@ void TabManagerDelegate::DistributeOomScoreInRange(
|
| int score = static_cast<int>(priority + 0.5f);
|
| if (cur->is_arc_app) {
|
| // Use pid as map keys so it's globally unique.
|
| - (*new_map)[cur->app->pid] = score;
|
| + (*new_map)[cur->app->pid()] = score;
|
| int cur_app_pid_score = 0;
|
| {
|
| base::AutoLock oom_score_autolock(oom_score_lock_);
|
| - cur_app_pid_score = oom_score_map_[cur->app->pid];
|
| + cur_app_pid_score = oom_score_map_[cur->app->pid()];
|
| }
|
| if (cur_app_pid_score != score) {
|
| VLOG(3) << "Set OOM score " << score << " for " << *cur;
|
| - SetOomScoreAdjForApp(cur->app->nspid, score);
|
| + SetOomScoreAdjForApp(cur->app->nspid(), score);
|
| }
|
| } else {
|
| base::ProcessHandle process_handle = cur->tab->renderer_handle;
|
|
|