Use ARC_GET_INSTANCE_FOR_METHOD for getting intent_helper instance

components/arc/intent_helper/activity_icon_loader.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 "components/arc/intent_helper/activity_icon_loader.h"
 
 #include <string.h>
 
 #include <tuple>
 #include <utility>
@@ skipping 10 matching lines @@
 
 namespace arc {
 
 namespace {
 
 constexpr size_t kSmallIconSizeInDip = 16;
 constexpr size_t kLargeIconSizeInDip = 20;
 constexpr size_t kMaxIconSizeInPx = 200;
 constexpr char kPngDataUrlPrefix[] = "data:image/png;base64,";
 
-constexpr int kMinInstanceVersion = 3;  // see intent_helper.mojom
-
 ui::ScaleFactor GetSupportedScaleFactor() {
   std::vector<ui::ScaleFactor> scale_factors = ui::GetSupportedScaleFactors();
   DCHECK(!scale_factors.empty());
   return scale_factors.back();
 }
 
+// Returns an instance for calling RequestActivityIcons().
+mojom::IntentHelperInstance* GetInstanceForRequestActivityIcons(
+    ArcIntentHelperBridge::GetResult* out_error_code) {
+  if (!ArcIntentHelperBridge::IsIntentHelperAvailable(out_error_code))
+    return nullptr;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
+      RequestActivityIcons);
+  if (!instance && out_error_code) {
+    *out_error_code =
+        ArcIntentHelperBridge::GetResult::FAILED_ARC_NOT_SUPPORTED;
+  }
+  return instance;
+}
+
 }  // namespace
 
 ActivityIconLoader::Icons::Icons(
     const gfx::Image& icon16,
     const gfx::Image& icon20,
     const scoped_refptr<base::RefCountedData<GURL>>& icon16_dataurl)
     : icon16(icon16), icon20(icon20), icon16_dataurl(icon16_dataurl) {}
 
 ActivityIconLoader::Icons::Icons(const Icons& other) = default;
 
@@ skipping 41 matching lines @@
     }
   }
 
   if (activities_to_fetch.empty()) {
     // If there's nothing to fetch, run the callback now.
     cb.Run(std::move(result));
     return GetResult::SUCCEEDED_SYNC;
   }
 
   ArcIntentHelperBridge::GetResult error_code;
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
-      "RequestActivityIcons", kMinInstanceVersion, &error_code);
+  auto* instance = GetInstanceForRequestActivityIcons(&error_code);
   if (!instance) {
     // The mojo channel is not yet ready (or not supported at all). Run the
     // callback with |result| that could be empty.
     cb.Run(std::move(result));
     switch (error_code) {
       case ArcIntentHelperBridge::GetResult::FAILED_ARC_NOT_READY:
         return GetResult(GetResult::FAILED_ARC_NOT_READY);
       case ArcIntentHelperBridge::GetResult::FAILED_ARC_NOT_SUPPORTED:
         return GetResult(GetResult::FAILED_ARC_NOT_SUPPORTED);
     }
@@ skipping 110 matching lines @@
     cached_icons_.erase(kv.first);
     cached_icons_.insert(std::make_pair(kv.first, kv.second));
   }
 
   // Merge the results that were obtained from cache before doing IPC.
   result->insert(cached_result->begin(), cached_result->end());
   cb.Run(std::move(result));
 }
 
 }  // namespace arc