[fsp] Decouple file_service_provider::Service.

chrome/browser/chromeos/file_system_provider/provided_file_system.h

Index: chrome/browser/chromeos/file_system_provider/provided_file_system.h
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
index 10aa0a93fc291a589c2f2adb75a7ab7ec7257b5b..c7f84603c8420c2cf61891afe145f6c87a3bc0c9 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
@@ -8,38 +8,38 @@
 #include <string>
 
 #include "base/files/file_path.h"
+#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
+#include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
+#include "chrome/browser/chromeos/file_system_provider/request_manager.h"

[hashimoto, 2014/03/26 03:03:01]

nit: No need to include this? Forward declaration isn't enough?

[mtomasz, 2014/03/26 05:45:13]

Done.

+
+namespace extensions {
+class EventRouter;
+}  // namespace extensions
 
 namespace chromeos {
 namespace file_system_provider {
 
-// Contains information about the provided file system instance.
-class ProvidedFileSystem {
+// Provided file system implementation. Forwards requests between providers and
+// clients.
+class ProvidedFileSystem : public ProvidedFileSystemInterface {
  public:
   ProvidedFileSystem();
-  ProvidedFileSystem(const std::string& extension_id,
-                     int file_system_id,
-                     const std::string& file_system_name,
-                     const base::FilePath& mount_path);
-
-  ~ProvidedFileSystem();
+  ProvidedFileSystem(extensions::EventRouter* event_router,
+                     RequestManager* request_manager,
+                     const ProvidedFileSystemInfo& file_system_info);
+  virtual ~ProvidedFileSystem();
 
-  const std::string& extension_id() const { return extension_id_; }
-  int file_system_id() const { return file_system_id_; }
-  const std::string& file_system_name() const { return file_system_name_; }
-  const base::FilePath& mount_path() const { return mount_path_; }
+  // ProvidedFileSystemInterface overrides.
+  virtual bool RequestUnmount(
+      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+  virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const OVERRIDE;
 
  private:
-  // ID of the extension providing this file system.
-  std::string extension_id_;
-
-  // ID of the file system, used internally.
-  int file_system_id_;
-
-  // Name of the file system, can be rendered in the UI.
-  std::string file_system_name_;
+  extensions::EventRouter* event_router_;  // Not owned.

[hashimoto, 2014/03/26 03:03:01]

nit: No need to have "Not owned" annotation.
If it's owned, it should be scoped_ptr anyways.
(http://www.chromium.org/developers/smart-pointer-guidelines)

[mtomasz, 2014/03/26 05:45:13]

Done.

+  RequestManager* request_manager_;        // Not owned.
+  ProvidedFileSystemInfo file_system_info_;
 
-  // Mount path of the underlying file system.
-  base::FilePath mount_path_;
+  DISALLOW_COPY_AND_ASSIGN(ProvidedFileSystem);
 };
 
 }  // namespace file_system_provider