Consolidate 4 GetIntentHelper functions

components/arc/intent_helper/arc_intent_helper_bridge.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/arc_intent_helper_bridge.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/new_window_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
+#include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/link_handler_model_impl.h"
 #include "components/arc/intent_helper/local_activity_resolver.h"
 #include "components/arc/set_wallpaper_delegate.h"
 #include "ui/base/layout.h"
 #include "url/gurl.h"
 
 namespace arc {
 
@@ skipping 94 matching lines @@
     mojo::Array<mojom::UrlHandlerInfoPtr> handlers) {
   mojo::Array<mojom::UrlHandlerInfoPtr> handlers_filtered;
   for (auto& handler : handlers) {
     if (IsIntentHelperPackage(handler->package_name.get()))
       continue;
     handlers_filtered.push_back(std::move(handler));
   }
   return handlers_filtered;
 }
 
+// static
+mojom::IntentHelperInstance* ArcIntentHelperBridge::GetIntentHelperInstance(
+    int min_instance_version,
+    GetResult* out_error_code) {
+  if (!ArcBridgeService::GetEnabled(base::CommandLine::ForCurrentProcess())) {

[Luis Héctor Chávez, 2016/09/14 21:09:12]

Maybe only do this if |bridge_service| is nullptr. That's a much cheaper check.

[Yusuke Sato, 2016/09/14 21:21:49]

Done.

+    VLOG(2) << "ARC bridge is not supported.";
+    if (out_error_code)
+      *out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
+    return nullptr;
+  }
+  ArcBridgeService* bridge_service = ArcBridgeService::Get();
+  if (!bridge_service) {
+    VLOG(2) << "ARC bridge is not ready.";
+    if (out_error_code)
+      *out_error_code = GetResult::FAILED_ARC_NOT_READY;
+    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.";
+    if (out_error_code)
+      *out_error_code = GetResult::FAILED_ARC_NOT_READY;
+    return nullptr;
+  }
+  const int version = bridge_service->intent_helper()->version();
+  if (version < min_instance_version) {
+    VLOG(1) << "ARC intent helper instance is too old. required: "
+            << min_instance_version << ", actual: " << version;
+    if (out_error_code)
+      *out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
+    return nullptr;
+  }
+  return intent_helper_instance;
+}
+
+// static
+mojom::IntentHelperInstance* ArcIntentHelperBridge::GetIntentHelperInstance(
+    int min_instance_version) {
+  return GetIntentHelperInstance(min_instance_version, nullptr);
+}
+
 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
     mojo::Array<mojom::IntentFilterPtr> filters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   activity_resolver_->UpdateIntentFilters(std::move(filters));
 }
 
 }  // namespace arc