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

chrome/browser/chromeos/arc/arc_external_protocol_dialog.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 "chrome/browser/chromeos/arc/arc_external_protocol_dialog.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 14 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 using content::WebContents;
 
 namespace arc {
 
 namespace {
 
-constexpr uint32_t kMinInstanceVersion = 3;  // RequestActivityIcons' MinVersion
+constexpr uint32_t kMinVersionForHandleUrl = 2;
+constexpr uint32_t kMinVersionForRequestUrlHandlerList = 2;
 
 // Shows the Chrome OS' original external protocol dialog as a fallback.
 void ShowFallbackExternalProtocolDialog(int render_process_host_id,
                                         int routing_id,
                                         const GURL& url) {
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_host_id, routing_id);
   new ExternalProtocolDialog(web_contents, url);
 }
 
-mojom::IntentHelperInstance* GetIntentHelper() {
-  return ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion);
-}
-
 scoped_refptr<ActivityIconLoader> GetIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ArcServiceManager* arc_service_manager = ArcServiceManager::Get();
   return arc_service_manager ? arc_service_manager->icon_loader() : nullptr;
 }
 
 void CloseTabIfNeeded(int render_process_host_id, int routing_id) {
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_host_id, routing_id);
   if (web_contents && web_contents->GetController().IsInitialNavigation())
     web_contents->Close();
 }
 
 // Called when the dialog is closed.
 void OnIntentPickerClosed(int render_process_host_id,
                           int routing_id,
                           const GURL& url,
                           mojo::Array<mojom::IntentHandlerInfoPtr> handlers,
                           size_t selected_app_index,
                           ArcNavigationThrottle::CloseReason close_reason) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  mojom::IntentHelperInstance* intent_helper = GetIntentHelper();
-  if (!intent_helper || selected_app_index >= handlers.size())
+  // Make sure that the instance at least supports HandleUrl.
+  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
+      "HandleUrl", kMinVersionForHandleUrl);
+  if (!instance || selected_app_index >= handlers.size())
     close_reason = ArcNavigationThrottle::CloseReason::ERROR;
 
   switch (close_reason) {
     case ArcNavigationThrottle::CloseReason::ALWAYS_PRESSED: {
       // TODO(yusukes): Add NOTREACHED(); break; here once b/31665510 is fixed.
       // fall through, for now.
     }
     case ArcNavigationThrottle::CloseReason::JUST_ONCE_PRESSED: {
       // Launch the selected app.
-      intent_helper->HandleUrl(url.spec(),
-                               handlers[selected_app_index]->package_name);
+      instance->HandleUrl(url.spec(),
+                          handlers[selected_app_index]->package_name);
       CloseTabIfNeeded(render_process_host_id, routing_id);
       break;
     }
     case ArcNavigationThrottle::CloseReason::PREFERRED_ACTIVITY_FOUND: {
       // Our OnUrlHandlerList callback does not search for a preferred activity.
       NOTREACHED();
       break;
     }
     case ArcNavigationThrottle::CloseReason::ERROR:
     case ArcNavigationThrottle::CloseReason::INVALID: {
@@ skipping 38 matching lines @@
                                 routing_id, url, base::Passed(&handlers)));
 }
 
 // Called when ARC returned a handler list for the |url|.
 void OnUrlHandlerList(int render_process_host_id,
                       int routing_id,
                       const GURL& url,
                       mojo::Array<mojom::IntentHandlerInfoPtr> handlers) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  mojom::IntentHelperInstance* intent_helper = GetIntentHelper();
+  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
+      "HandleUrl", kMinVersionForHandleUrl);
   scoped_refptr<ActivityIconLoader> icon_loader = GetIconLoader();
 
-  if (!intent_helper || !icon_loader || !handlers.size()) {
+  if (!instance || !icon_loader || !handlers.size()) {
     // No handler is available on ARC side. Show the Chrome OS dialog.
     ShowFallbackExternalProtocolDialog(render_process_host_id, routing_id, url);
     return;
   }
 
   // Otherwise, retrieve icons of the activities.
   std::vector<ActivityIconLoader::ActivityName> activities;
   for (const auto& handler : handlers) {
     activities.emplace_back(handler->package_name, handler->activity_name);
   }
   icon_loader->GetActivityIcons(
       activities, base::Bind(OnAppIconsReceived, render_process_host_id,
                              routing_id, url, base::Passed(&handlers)));
 }
 
 }  // namespace
 
 bool RunArcExternalProtocolDialog(const GURL& url,
                                   int render_process_host_id,
                                   int routing_id,
                                   ui::PageTransition page_transition,
                                   bool has_user_gesture) {
   if (ShouldIgnoreNavigation(page_transition))
     return false;
 
-  mojom::IntentHelperInstance* intent_helper = GetIntentHelper();
-  if (!intent_helper)
+  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
+      "RequestUrlHandlerList", kMinVersionForRequestUrlHandlerList);
+  if (!instance)
     return false;  // ARC is either not supported or not yet ready.
 
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_host_id, routing_id);
   if (!web_contents || !web_contents->GetBrowserContext() ||
       web_contents->GetBrowserContext()->IsOffTheRecord()) {
     return false;
   }
 
   // Show ARC version of the dialog, which is IntentPickerBubbleView. To show
   // the bubble view, we need to ask ARC for a handler list first.
-  intent_helper->RequestUrlHandlerList(
+  instance->RequestUrlHandlerList(
       url.spec(),
       base::Bind(OnUrlHandlerList, render_process_host_id, routing_id, url));
   return true;
 }
 
 }  // namespace arc