| Index: chrome/browser/task_manager/providers/arc/arc_process_task.cc
|
| diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task.cc b/chrome/browser/task_manager/providers/arc/arc_process_task.cc
|
| index 4db749c0830af577cc5f2141033fd11a061f6acf..754641e64155e3e069414388996369febcf3e2e5 100644
|
| --- a/chrome/browser/task_manager/providers/arc/arc_process_task.cc
|
| +++ b/chrome/browser/task_manager/providers/arc/arc_process_task.cc
|
| @@ -20,6 +20,8 @@ namespace task_manager {
|
|
|
| namespace {
|
|
|
| +constexpr uint32_t kKillProcessMinInstanceVersion = 1;
|
| +
|
| base::string16 MakeTitle(const std::string& process_name,
|
| arc::mojom::ProcessState process_state) {
|
| int name_template = IDS_TASK_MANAGER_ARC_PREFIX;
|
| @@ -126,18 +128,12 @@ bool ArcProcessTask::IsKillable() {
|
| }
|
|
|
| void ArcProcessTask::Kill() {
|
| - arc::mojom::ProcessInstance* arc_process_instance =
|
| - arc::ArcBridgeService::Get()->process()->instance();
|
| - if (!arc_process_instance) {
|
| - LOG(ERROR) << "ARC process instance is not ready.";
|
| - return;
|
| - }
|
| - if (arc::ArcBridgeService::Get()->process()->version() < 1) {
|
| - LOG(ERROR) << "ARC KillProcess IPC is unavailable.";
|
| + auto* process_instance =
|
| + arc::ArcBridgeService::Get()->process()->GetInstanceForVersion(
|
| + kKillProcessMinInstanceVersion, "KillProcess");
|
| + if (!process_instance)
|
| return;
|
| - }
|
| - arc_process_instance->KillProcess(nspid_,
|
| - "Killed manually from Task Manager");
|
| + process_instance->KillProcess(nspid_, "Killed manually from Task Manager");
|
| }
|
|
|
| void ArcProcessTask::OnInstanceReady() {
|
|
|