arc: Add InstanceHelper::GetInstanceForMethod()

chrome/browser/task_manager/providers/arc/arc_process_task.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.

[Yusuke Sato, 2016/09/16 23:58:48]

Can you also modify the version() check in
ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode()?

[Luis Héctor Chávez, 2016/09/17 00:30:52]

Discussed offline. I'll keep the code as-is because
GetIntentHelperInstanceWithErrorCode needs to disambiguate between not-ready and
not-supported cases to return the correct error code.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/providers/arc/arc_process_task.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/common/process.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/child_process_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
 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;
   switch (process_state) {
     case arc::mojom::ProcessState::PERSISTENT:
     case arc::mojom::ProcessState::PERSISTENT_UI:
     case arc::mojom::ProcessState::TOP:
       name_template = IDS_TASK_MANAGER_ARC_SYSTEM;
       break;
     case arc::mojom::ProcessState::BOUND_FOREGROUND_SERVICE:
@@ skipping 86 matching lines @@
   // ARC process is not a child process of the browser.
   return content::ChildProcessHost::kInvalidUniqueID;
 }
 
 bool ArcProcessTask::IsKillable() {
   // Do not kill persistent processes.
   return process_state_ > arc::mojom::ProcessState::PERSISTENT_UI;
 }
 
 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.";
+  auto* process_instance =
+      arc::ArcBridgeService::Get()->process()->GetInstanceForVersion(
+          kKillProcessMinInstanceVersion, "KillProcess");
+  if (!process_instance)
     return;
-  }
-  if (arc::ArcBridgeService::Get()->process()->version() < 1) {
-    LOG(ERROR) << "ARC KillProcess IPC is unavailable.";
-    return;
-  }
-  arc_process_instance->KillProcess(nspid_,
-                                    "Killed manually from Task Manager");
+  process_instance->KillProcess(nspid_, "Killed manually from Task Manager");
 }
 
 void ArcProcessTask::OnInstanceReady() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   VLOG(2) << "intent_helper instance is ready. Fetching the icon for "
           << package_name_;
   arc::ArcBridgeService::Get()->intent_helper()->RemoveObserver(this);
 
   // Instead of calling into StartIconLoading() directly, return to the main
@@ skipping 14 matching lines @@
   for (const auto& kv : *icons) {
     const gfx::Image& icon = kv.second.icon16;
     if (icon.IsEmpty())
       continue;
     set_icon(*icon.ToImageSkia());
     break;  // Since the parent class can hold only one icon, break here.
   }
 }
 
 }  // namespace task_manager