Get rid of RefCounted for ActivityIconLoader.

chrome/browser/chromeos/file_manager/arc_file_tasks.cc

Index: chrome/browser/chromeos/file_manager/arc_file_tasks.cc
diff --git a/chrome/browser/chromeos/file_manager/arc_file_tasks.cc b/chrome/browser/chromeos/file_manager/arc_file_tasks.cc
index 6ab612eed2f2ca0724442fae3bd4d92b61986503..7f248102ebb754b4ab699ba896b0d3563800f00b 100644
--- a/chrome/browser/chromeos/file_manager/arc_file_tasks.cc
+++ b/chrome/browser/chromeos/file_manager/arc_file_tasks.cc
@@ -35,16 +35,6 @@ namespace {
 
 constexpr char kAppIdSeparator = '/';
 
-// Returns the icon loader that wraps the Mojo interface for ARC Intent Helper.
-scoped_refptr<arc::ActivityIconLoader> GetArcActivityIconLoader() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  arc::ArcServiceManager* arc_service_manager = arc::ArcServiceManager::Get();
-  if (!arc_service_manager)
-    return nullptr;
-  return arc_service_manager->icon_loader();
-}
-
 // Converts an Android intent action (see kIntentAction* in
 // components/arc/intent_helper/intent_constants.h) to a file task action ID
 // (see chrome/browser/chromeos/file_manager/file_tasks.h).
@@ -111,9 +101,9 @@ void OnArcHandlerList(
     std::vector<arc::mojom::IntentHandlerInfoPtr> handlers) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  scoped_refptr<arc::ActivityIconLoader> icon_loader =
-      GetArcActivityIconLoader();
-  if (!icon_loader) {
+  auto* intent_helper_bridge =
+      arc::ArcServiceManager::GetGlobalService<arc::ArcIntentHelperBridge>();
+  if (!intent_helper_bridge) {
     callback.Run(std::move(result_list));
     return;
   }
@@ -124,7 +114,7 @@ void OnArcHandlerList(
   for (const arc::mojom::IntentHandlerInfoPtr& handler : handlers_filtered)
     activity_names.emplace_back(handler->package_name, handler->activity_name);
 
-  icon_loader->GetActivityIcons(
+  intent_helper_bridge->icon_loader()->GetActivityIcons(
       activity_names, base::Bind(&OnArcIconLoaded, base::Passed(&result_list),
                                  callback, base::Passed(&handlers_filtered)));
 }