Consolidate 4 GetIntentHelper functions

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 {
 
 const size_t kSmallIconSizeInDip = 16;
 const size_t kLargeIconSizeInDip = 20;
 const size_t kMaxIconSizeInPx = 200;
 
 const int kMinInstanceVersion = 3;  // see intent_helper.mojom
 
-mojom::IntentHelperInstance* GetIntentHelperInstance(
-    ActivityIconLoader::GetResult* out_error_code) {
-  DCHECK(out_error_code);
-  ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
-  if (!bridge_service) {
-    VLOG(2) << "ARC bridge is not ready.";
-    *out_error_code = ActivityIconLoader::GetResult::FAILED_ARC_NOT_SUPPORTED;
-    return nullptr;
-  }
-  mojom::IntentHelperInstance* intent_helper_instance =
-      bridge_service->intent_helper()->instance();
-  if (!intent_helper_instance) {
-    VLOG(2) << "ARC intent helper instance is not ready.";
-    *out_error_code = ActivityIconLoader::GetResult::FAILED_ARC_NOT_READY;
-    return nullptr;
-  }
-  if (bridge_service->intent_helper()->version() < kMinInstanceVersion) {
-    VLOG(1) << "ARC intent helper instance is too old.";
-    *out_error_code = ActivityIconLoader::GetResult::FAILED_ARC_NOT_SUPPORTED;
-    return nullptr;
-  }
-  return intent_helper_instance;
-}
-
 ui::ScaleFactor GetSupportedScaleFactor() {
   std::vector<ui::ScaleFactor> scale_factors = ui::GetSupportedScaleFactors();
   DCHECK(!scale_factors.empty());
   return scale_factors.back();
 }
 
 }  // namespace
 
 ActivityIconLoader::Icons::Icons(const gfx::Image& icon16,
                                  const gfx::Image& icon20)
@@ skipping 40 matching lines @@
       result->insert(std::make_pair(activity, it->second));
     }
   }
 
   if (activities_to_fetch.empty()) {
     // If there's nothing to fetch, run the callback now.
     cb.Run(std::move(result));
     return GetResult::SUCCEEDED_SYNC;
   }
 
-  GetResult error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
-  mojom::IntentHelperInstance* instance = GetIntentHelperInstance(&error_code);
+  ArcIntentHelperBridge::GetResult error_code;
+  mojom::IntentHelperInstance* instance =
+      ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
+          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));
-    return error_code;
+    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);
+    }
+    NOTREACHED();
   }
 
   // Fetch icons from ARC.
   instance->RequestActivityIcons(
       std::move(activities_to_fetch), mojom::ScaleFactor(scale_factor_),
       base::Bind(&ActivityIconLoader::OnIconsReady, this, base::Passed(&result),
                  cb));
   return GetResult::SUCCEEDED_ASYNC;
 }
 
@@ skipping 82 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