Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / syncable_file_system_util.h

diff --git a/src/chrome/browser/sync_file_system/syncable_file_system_util.h b/src/chrome/browser/sync_file_system/syncable_file_system_util.h
index 35512ca..25c2411 100644 (file)
--- a/src/chrome/browser/sync_file_system/syncable_file_system_util.h
+++ b/src/chrome/browser/sync_file_system/syncable_file_system_util.h
@@ -77,23 +77,6 @@ bool SerializeSyncableFileSystemURL(
 bool DeserializeSyncableFileSystemURL(
     const std::string& serialized_url, fileapi::FileSystemURL* url);
 
-// Enables or disables directory operations in Sync FileSystem API.
-// TODO(nhiroki): This method should be used only for testing and should go
-// away when we fully support directory operations. (http://crbug.com/161442)
-void SetEnableSyncFSDirectoryOperation(bool flag);
-
-// Returns true if we allow directory operations in Sync FileSystem API.
-// It is disabled by default but can be overridden by a command-line switch
-// (--enable-syncfs-directory-operations) or by calling
-// SetEnableSyncFSDirectoryOperation().
-// TODO(nhiroki): This method should be used only for testing and should go
-// away when we fully support directory operations. (http://crbug.com/161442)
-bool IsSyncFSDirectoryOperationEnabled();
-
-// Checks the same as above, but takes |origin| and sees if directory operation
-// is enabled specifically for this |origin|.
-bool IsSyncFSDirectoryOperationEnabled(const GURL& origin);
-
 // Returns true if V2 is enabled.
 bool IsV2Enabled();
 
@@ -103,34 +86,24 @@ bool IsV2EnabledForOrigin(const GURL& origin);
 // Returns SyncFileSystem sub-directory path.
 base::FilePath GetSyncFileSystemDir(const base::FilePath& profile_base_dir);
 
-// Enables directory operation for syncable filesystems temporarily for testing.
-class ScopedEnableSyncFSDirectoryOperation {
+// Disables V2 backend for syncable filesystems temporarily for testing.
+class ScopedDisableSyncFSV2 {
  public:
-  ScopedEnableSyncFSDirectoryOperation();
-  ~ScopedEnableSyncFSDirectoryOperation();
+  ScopedDisableSyncFSV2();
+  ~ScopedDisableSyncFSV2();
 
  private:
   bool was_enabled_;
 
-  DISALLOW_COPY_AND_ASSIGN(ScopedEnableSyncFSDirectoryOperation);
-};
-
-// Enables V2 backend for syncable filesystems temporarily for testing.
-class ScopedEnableSyncFSV2 {
- public:
-  ScopedEnableSyncFSV2();
-  ~ScopedEnableSyncFSV2();
-
- private:
-  bool was_enabled_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedEnableSyncFSV2);
+  DISALLOW_COPY_AND_ASSIGN(ScopedDisableSyncFSV2);
 };
 
 // Posts |callback| to the current thread.
 void RunSoon(const tracked_objects::Location& from_here,
              const base::Closure& callback);
 
+base::Closure NoopClosure();
+
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNCABLE_FILE_SYSTEM_UTIL_H_