arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_downloads_watcher_service.h

Index: chrome/browser/chromeos/arc/arc_downloads_watcher_service.h
diff --git a/chrome/browser/chromeos/arc/arc_downloads_watcher_service.h b/chrome/browser/chromeos/arc/arc_downloads_watcher_service.h
index 42c28ce60d955c796332ee020c449d1ec6b22a94..16e02b893448317467e112af8ffe55619959e30e 100644
--- a/chrome/browser/chromeos/arc/arc_downloads_watcher_service.h
+++ b/chrome/browser/chromeos/arc/arc_downloads_watcher_service.h
@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
+#include "components/arc/instance_holder.h"
 
 namespace base {
 class FilePath;
@@ -21,15 +22,16 @@ namespace arc {
 
 // Watches Downloads directory and registers newly created media files to
 // Android MediaProvider.
-class ArcDownloadsWatcherService : public ArcService,
-                                   public ArcBridgeService::Observer {
+class ArcDownloadsWatcherService
+    : public ArcService,
+      public InstanceHolder<mojom::FileSystemInstance>::Observer {
  public:
   explicit ArcDownloadsWatcherService(ArcBridgeService* bridge_service);
   ~ArcDownloadsWatcherService() override;
 
-  // ArcBridgeService::Observer
-  void OnFileSystemInstanceReady() override;
-  void OnFileSystemInstanceClosed() override;
+  // InstanceHolder<mojom::FileSystemInstance>::Observer
+  void OnInstanceReady(mojom::FileSystemInstance*, uint32_t version) override;
+  void OnInstanceClosed(mojom::FileSystemInstance*) override;
 
  private:
   class DownloadsWatcher;