Consolidate 4 GetIntentHelper functions

components/arc/intent_helper/arc_intent_helper_bridge.h

 // 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.
 
 #ifndef COMPONENTS_ARC_INTENT_HELPER_ARC_INTENT_HELPER_BRIDGE_H_
 #define COMPONENTS_ARC_INTENT_HELPER_ARC_INTENT_HELPER_BRIDGE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 19 matching lines @@
 class LocalActivityResolver;
 class SetWallpaperDelegate;
 
 // Receives intents from ARC.
 class ArcIntentHelperBridge
     : public ArcService,
       public InstanceHolder<mojom::IntentHelperInstance>::Observer,
       public mojom::IntentHelperHost,
       public ash::LinkHandlerModelFactory {
  public:
+  enum class GetResult {
+    // Failed. The intent_helper instance is not yet ready. This is a temporary
+    // error.
+    FAILED_ARC_NOT_READY,
+    // Failed. Either ARC is not supported at all or intent_helper instance
+    // version is too old.
+    FAILED_ARC_NOT_SUPPORTED,
+  };
+
   ArcIntentHelperBridge(
       ArcBridgeService* bridge_service,
       const scoped_refptr<ActivityIconLoader>& icon_loader,
       const scoped_refptr<LocalActivityResolver>& activity_resolver);
   ~ArcIntentHelperBridge() override;
 
   // InstanceHolder<mojom::IntentHelperInstance>::Observer
   void OnInstanceReady() override;
   void OnInstanceClosed() override;
 
@@ skipping 10 matching lines @@
   std::unique_ptr<ash::LinkHandlerModel> CreateModel(const GURL& url) override;
 
   // Returns false if |package_name| is for the intent_helper apk.
   static bool IsIntentHelperPackage(const std::string& package_name);
 
   // Filters out handlers that belong to the intent_helper apk and returns
   // a new array.
   static mojo::Array<mojom::UrlHandlerInfoPtr> FilterOutIntentHelper(
       mojo::Array<mojom::UrlHandlerInfoPtr> handlers);
 
+  // Gets the mojo instance if it's available. On failure, returns nullptr and
+  // updates |out_error_code| if it's not nullptr.
+  static mojom::IntentHelperInstance* GetIntentHelperInstanceWithErrorCode(
+      int min_instance_version,
+      GetResult* out_error_code);
+
+  // Does the same as above without asking for the error code.
+  static mojom::IntentHelperInstance* GetIntentHelperInstance(
+      int min_instance_version);
+
  private:
   mojo::Binding<mojom::IntentHelperHost> binding_;
   scoped_refptr<ActivityIconLoader> icon_loader_;
   scoped_refptr<LocalActivityResolver> activity_resolver_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcIntentHelperBridge);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_INTENT_HELPER_ARC_INTENT_HELPER_BRIDGE_H_