Always use arc::InstanceHolder<T>::GetInstanceForMethod

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 71 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;
-  mojom::IntentHelperInstance* instance =
-      ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
-          kMinInstanceVersion, &error_code);
+  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
+      "RequestActivityIcons", kMinInstanceVersion, &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 93 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