SyncFS: Introduce SyncFileSystemBackend

webkit/browser/fileapi/sandbox_file_system_backend.h

 // Copyright (c) 2012 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.
 
 #ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_H_
 #define WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 55 matching lines @@
     virtual bool HasFileSystemType(FileSystemType type) const = 0;
   };
 
   SandboxFileSystemBackend(
       SandboxContext* sandbox_context,
       const FileSystemOptions& file_system_options);
   virtual ~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,
       OpenFileSystemMode mode,
       FileSystemContext* context,
       const InitializeFileSystemCallback& callback) OVERRIDE;
   virtual FileSystemFileUtil* GetFileUtil(FileSystemType type) OVERRIDE;
   virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE;
   virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
       FileSystemType type,
@@ skipping 73 matching lines @@
   void CollectOpenFileSystemMetrics(base::PlatformFileError error_code);
 
   // Performs API-specific validity checks on the given path |url|.
   // Returns true if access to |url| is valid in this filesystem.
   bool IsAccessValid(const FileSystemURL& url) const;
 
   void set_enable_temporary_file_system_in_incognito(bool enable) {
     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;
   friend class SandboxFileSystemBackendMigrationTest;
   friend class SandboxFileSystemBackendOriginEnumeratorTest;
 
   // Returns a path to the usage cache file.
   base::FilePath GetUsageCachePathForOriginAndType(
       const GURL& origin_url,
       FileSystemType type);
@@ skipping 15 matching lines @@
   static void InvalidateUsageCacheOnFileThread(
       ObfuscatedFileUtil* file_util,
       const GURL& origin,
       FileSystemType type,
       FileSystemUsageCache* usage_cache);
 
   int64 RecalculateUsage(FileSystemContext* context,
                          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);
 };
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_H_
+#endif  /// WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_H_