arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/file_manager/arc_file_tasks.cc

 // Copyright (c) 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/file_manager/arc_file_tasks.h"
 
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 28 matching lines @@
 constexpr base::FilePath::CharType kRemovableMediaPath[] =
     FILE_PATH_LITERAL("/media/removable");
 constexpr char kArcRemovableMediaProviderUrl[] =
     "content://org.chromium.arc.removablemediaprovider/";
 constexpr char kAppIdSeparator = '/';
 constexpr char kPngDataUrlPrefix[] = "data:image/png;base64,";
 
 // Returns the Mojo interface for ARC Intent Helper, with version |minVersion|
 // or above. If the ARC bridge is not established, returns null.
 arc::mojom::IntentHelperInstance* GetArcIntentHelper(Profile* profile,
-                                                     int min_version) {
+                                                     uint32_t min_version) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // File manager in secondary profile cannot access ARC.
   if (!chromeos::ProfileHelper::IsPrimaryProfile(profile))
     return nullptr;
 
   arc::ArcBridgeService* arc_service = arc::ArcBridgeService::Get();
   if (!arc_service)
     return nullptr;
 
   arc::mojom::IntentHelperInstance* intent_helper_instance =
-      arc_service->intent_helper_instance();
+      arc_service->intent_helper()->instance();
   if (!intent_helper_instance)
     return nullptr;
 
-  if (arc_service->intent_helper_version() < min_version) {
+  if (arc_service->intent_helper()->version() < min_version) {
     DLOG(WARNING) << "ARC intent helper instance is too old.";
     return nullptr;
   }
   return intent_helper_instance;
 }
 
 // Returns the icon loader that wraps the Mojo interface for ARC Intent Helper.
 scoped_refptr<arc::ActivityIconLoader> GetArcActivityIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 266 matching lines @@
   } else {
     arc_intent_helper->HandleUrlListDeprecated(
         std::move(urls), AppIdToActivityName(task.app_id)->package_name,
         StringToArcAction(task.action_id));
   }
   return true;
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager