SyncFS: Introduce SyncFileSystemBackend

webkit/browser/fileapi/sandbox_file_system_backend.h

Index: webkit/browser/fileapi/sandbox_file_system_backend.h
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend.h b/webkit/browser/fileapi/sandbox_file_system_backend.h
index 5ac590f6bc4a9316a0358bd9de870d757346a0ab..8f344865a2c2f76fe9cba773eb923c20f8940b90 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend.h
+++ b/webkit/browser/fileapi/sandbox_file_system_backend.h
@@ -73,6 +73,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackend
 
   // FileSystemBackend overrides.
   virtual bool CanHandleType(FileSystemType type) const OVERRIDE;
+  virtual void Initialize(const fileapi::FileSystemContext* context) OVERRIDE;
   virtual void InitializeFileSystem(
       const GURL& origin_url,
       FileSystemType type,
@@ -166,6 +167,19 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackend
     enable_temporary_file_system_in_incognito_ = enable;
   }
 
+ protected:
+  SandboxContext* sandbox_context_;  // Not owned.
+
+  // Observers.
+  UpdateObserverList update_observers_;
+  ChangeObserverList change_observers_;
+  AccessObserverList access_observers_;

[kinuko, 2013/07/23 06:41:51]

Can we keep them as private members but provide protected accessors?

[nhiroki, 2013/07/24 05:58:47]

Done.

+
+  // Indicates if the usage tracking for FileSystem is enabled or not.
+  // The usage tracking is enabled by default and can be disabled by
+  // a command-line switch (--disable-file-system-usage-tracking).
+  bool enable_usage_tracking_;

[kinuko, 2013/07/23 06:41:51]

I wonder if it's cleaner to move this into SandboxContext?

[nhiroki, 2013/07/24 05:58:47]

Done in http://crrev.com/213070/

+
  private:
   friend class SandboxQuotaObserver;
   friend class SandboxFileSystemTestHelper;
@@ -201,32 +215,16 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackend
                          const GURL& origin,
                          FileSystemType type);
 
-  SandboxContext* sandbox_context_;  // Not owned.
-
   FileSystemOptions file_system_options_;
   bool enable_temporary_file_system_in_incognito_;
 
   // Acccessed only on the file thread.
   std::set<GURL> visited_origins_;
 
-  // Observers.
-  UpdateObserverList update_observers_;
-  ChangeObserverList change_observers_;
-  AccessObserverList access_observers_;
-
-  // Observers for syncable file systems.
-  UpdateObserverList syncable_update_observers_;
-  ChangeObserverList syncable_change_observers_;
-
   base::Time next_release_time_for_open_filesystem_stat_;
 
   std::set<std::pair<GURL, FileSystemType> > sticky_dirty_origins_;
 
-  // Indicates if the usage tracking for FileSystem is enabled or not.
-  // The usage tracking is enabled by default and can be disabled by
-  // a command-line switch (--disable-file-system-usage-tracking).
-  bool enable_usage_tracking_;
-
   base::WeakPtrFactory<SandboxFileSystemBackend> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SandboxFileSystemBackend);
@@ -234,4 +232,4 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackend
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_H_
+#endif  /// WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_H_