arc: Add InstanceHelper::GetInstanceForMethod()

chrome/browser/ui/app_list/arc/arc_app_utils.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 "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "ash/shell.h"
@@ skipping 13 matching lines @@
 
 namespace {
 
 // Default sizes to use.
 constexpr int kNexus7Width = 960;
 constexpr int kNexus7Height = 600;
 constexpr int kNexus5Width = 410;
 constexpr int kNexus5Height = 690;
 
 // Minimum required versions.
 constexpr int kMinVersion = 0;

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

uint32_t (line 34-41)

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

Good catch, done.

 constexpr int kCanHandleResolutionMinVersion = 1;
 constexpr int kSendBroadcastMinVersion = 1;
 constexpr int kUninstallPackageMinVersion = 2;
 constexpr int kTaskSupportMinVersion = 3;
 constexpr int kShowPackageInfoMinVersion = 5;
 constexpr int kRemoveIconMinVersion = 9;
 constexpr int kShowPackageInfoOnPageMinVersion = 10;
 
 // Service name strings.
 constexpr char kCanHandleResolutionStr[] = "get resolution capability";
 constexpr char kCloseTaskStr[] = "close task";
 constexpr char kLaunchAppStr[] = "launch app";
 constexpr char kRemoveIconStr[] = "remove icon";
 constexpr char kSetActiveTaskStr[] = "set active task";
 constexpr char kShowPackageInfoStr[] = "show package info";
 constexpr char kUninstallPackageStr[] = "uninstall package";
 
 // Helper function which returns the AppInstance. Create related logs when error
 // happens.
 arc::mojom::AppInstance* GetAppInstance(int required_version,

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

What about changing the type to uint32_t while you're at it?

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

Done.

                                         const std::string& service_name) {
   arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
   if (!bridge_service) {
     VLOG(2) << "Request to " << service_name
             << " when bridge service is not ready.";
     return nullptr;
   }
 
-  arc::mojom::AppInstance* app_instance = bridge_service->app()->instance();
-  if (!app_instance) {
-    VLOG(2) << "Request to " << service_name
-            << " when mojom::app_instance is not ready.";
-    return nullptr;
-  }
-
-  int bridge_version = bridge_service->app()->version();
-  if (bridge_version < required_version) {
-    VLOG(2) << "Request to " << service_name << " when Arc version "
-            << bridge_version << " does not support it.";
-    return nullptr;
-  }
-
-  return app_instance;
+  return bridge_service->app()->GetInstanceForVersion(required_version,
+                                                      service_name.c_str());
 }
 
 void PrioritizeArcInstanceCallback(bool success) {
   VLOG(2) << "Finished prioritizing the instance: result=" << success;
   if (!success)
     LOG(ERROR) << "Failed to prioritize ARC";
 }
 
 // Find a proper size and position for a given rectangle on the screen.
 // TODO(skuhne): This needs more consideration, but it is lacking
@@ skipping 209 matching lines @@
   app_instance->CloseTask(task_id);
 }
 
 void ShowTalkBackSettings() {
   arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
   if (!bridge_service) {
     VLOG(2) << "ARC bridge is not ready";
     return;
   }
 
-  arc::mojom::IntentHelperInstance *intent_helper_instance =
-      bridge_service->intent_helper()->instance();
-  if (!intent_helper_instance) {
-    VLOG(2) << "ARC intent helper instance is not ready";
+  auto* intent_helper_instance =
+      bridge_service->intent_helper()->GetInstanceForVersion(
+          kSendBroadcastMinVersion, "SendBroadcast");
+  if (!intent_helper_instance)
     return;
-  }
-  if (bridge_service->intent_helper()->version() < kSendBroadcastMinVersion) {
-    VLOG(2) << "ARC intent helper instance is too old";
-    return;
-  }
 
   intent_helper_instance->SendBroadcast(
           "org.chromium.arc.intent_helper.SHOW_TALKBACK_SETTINGS",
           "org.chromium.arc.intent_helper",
           "org.chromium.arc.intent_helper.SettingsReceiver",
           "{}");
 }
 
 bool CanHandleResolution(content::BrowserContext* context,
                          const std::string& app_id,
@@ skipping 63 matching lines @@
   if (!app_instance)
     return false;
 
   app_instance->ShowPackageInfoOnPage(
       package_name, page,
       GetTargetRect(gfx::Size(kNexus7Width, kNexus7Height)));
   return true;
 }
 
 }  // namespace arc