arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_downloads_watcher_service.cc

Index: chrome/browser/chromeos/arc/arc_downloads_watcher_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_downloads_watcher_service.cc b/chrome/browser/chromeos/arc/arc_downloads_watcher_service.cc
index e921a4c3b28ba529aadfd3d85e24d9c5acb208e3..8bae833b113d0fc53cc32e5984c8812d47347b3b 100644
--- a/chrome/browser/chromeos/arc/arc_downloads_watcher_service.cc
+++ b/chrome/browser/chromeos/arc/arc_downloads_watcher_service.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/arc/arc_downloads_watcher_service.h"
 
+#include <map>
 #include <memory>
 #include <utility>
 
@@ -175,22 +176,22 @@ ArcDownloadsWatcherService::ArcDownloadsWatcherService(
     ArcBridgeService* bridge_service)
     : ArcService(bridge_service), weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->file_system()->AddObserver(this);
 }
 
 ArcDownloadsWatcherService::~ArcDownloadsWatcherService() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->file_system()->RemoveObserver(this);
   StopWatchingDownloads();
   DCHECK(!watcher_.get());
 }
 
-void ArcDownloadsWatcherService::OnFileSystemInstanceReady() {
+void ArcDownloadsWatcherService::OnInstanceReady() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   StartWatchingDownloads();
 }
 
-void ArcDownloadsWatcherService::OnFileSystemInstanceClosed() {
+void ArcDownloadsWatcherService::OnInstanceClosed() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   StopWatchingDownloads();
 }
@@ -219,7 +220,7 @@ void ArcDownloadsWatcherService::OnDownloadsChanged(
     const std::vector<base::FilePath>& paths) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
-  auto instance = arc_bridge_service()->file_system_instance();
+  auto instance = arc_bridge_service()->file_system()->instance();
   if (!instance) {
     return;
   }