arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_downloads_watcher_service.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_downloads_watcher_service.h"
 
+#include <map>
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/download/download_prefs.h"
@@ skipping 151 matching lines @@
     const base::FileEnumerator::FileInfo& info = enumerator.GetInfo();
     timestamp_map[android_path] = info.GetLastModifiedTime();
   }
   return timestamp_map;
 }
 
 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();
 }
 
 void ArcDownloadsWatcherService::StartWatchingDownloads() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   StopWatchingDownloads();
   DCHECK(!watcher_.get());
   watcher_ = base::MakeUnique<DownloadsWatcher>(
       base::Bind(&ArcDownloadsWatcherService::OnDownloadsChanged,
                  weak_ptr_factory_.GetWeakPtr()));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&DownloadsWatcher::Start, base::Unretained(watcher_.get())));
 }
 
 void ArcDownloadsWatcherService::StopWatchingDownloads() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (watcher_.get()) {
     BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE,
                               watcher_.release());
   }
 }
 
 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;
   }
 
   mojo::Array<mojo::String> mojo_paths(paths.size());
   for (size_t i = 0; i < paths.size(); ++i) {
     mojo_paths[i] = paths[i].value();
   }
   instance->RequestMediaScan(std::move(mojo_paths));
 }
 
 }  // namespace arc