Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / local / syncable_file_system_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
index 3c961a6..5bf7d68 100644 (file)
--- a/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
+++ b/src/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc
@@ -12,23 +12,23 @@
 #include "content/public/test/async_file_test_helper.h"
 #include "content/public/test/sandbox_file_system_test_helper.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/isolated_context.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/common/fileapi/file_system_types.h"
+#include "storage/common/quota/quota_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/isolated_context.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/common/quota/quota_types.h"
 
 using content::SandboxFileSystemTestHelper;
-using fileapi::FileSystemContext;
-using fileapi::FileSystemOperationContext;
-using fileapi::FileSystemURL;
-using fileapi::FileSystemURLSet;
-using quota::QuotaManager;
-using quota::QuotaStatusCode;
+using storage::FileSystemContext;
+using storage::FileSystemOperationContext;
+using storage::FileSystemURL;
+using storage::FileSystemURLSet;
+using storage::QuotaManager;
+using storage::QuotaStatusCode;
 
 namespace sync_file_system {
 
@@ -128,7 +128,7 @@ TEST_F(SyncableFileSystemTest, SyncableLocalSandboxCombined) {
   const int64 kQuota = 12345 * 1024;
   QuotaManager::kSyncableStorageDefaultHostQuota = kQuota;
   int64 usage, quota;
-  EXPECT_EQ(quota::kQuotaStatusOk,
+  EXPECT_EQ(storage::kQuotaStatusOk,
             file_system_.GetUsageAndQuota(&usage, &quota));
 
   // Returned quota must be what we overrode. Usage must be greater than 0
@@ -145,7 +145,7 @@ TEST_F(SyncableFileSystemTest, SyncableLocalSandboxCombined) {
             file_system_.TruncateFile(URL("dir/foo"), kFileSizeToExtend));
 
   int64 new_usage;
-  EXPECT_EQ(quota::kQuotaStatusOk,
+  EXPECT_EQ(storage::kQuotaStatusOk,
             file_system_.GetUsageAndQuota(&new_usage, &quota));
   EXPECT_EQ(kFileSizeToExtend, new_usage - usage);
 
@@ -156,7 +156,7 @@ TEST_F(SyncableFileSystemTest, SyncableLocalSandboxCombined) {
             file_system_.TruncateFile(URL("dir/foo"), kFileSizeToExtend + 1));
 
   usage = new_usage;
-  EXPECT_EQ(quota::kQuotaStatusOk,
+  EXPECT_EQ(storage::kQuotaStatusOk,
             file_system_.GetUsageAndQuota(&new_usage, &quota));
   EXPECT_EQ(usage, new_usage);
 
@@ -165,7 +165,7 @@ TEST_F(SyncableFileSystemTest, SyncableLocalSandboxCombined) {
             file_system_.DeleteFileSystem());
 
   // Now the usage must be zero.
-  EXPECT_EQ(quota::kQuotaStatusOk,
+  EXPECT_EQ(storage::kQuotaStatusOk,
             file_system_.GetUsageAndQuota(&usage, &quota));
   EXPECT_EQ(0, usage);
 
@@ -248,39 +248,4 @@ TEST_F(SyncableFileSystemTest, ChangeTrackerSimple) {
                                   sync_file_system::SYNC_FILE_TYPE_FILE));
 }
 
-// Make sure directory operation is disabled (when it's configured so).
-TEST_F(SyncableFileSystemTest, DisableDirectoryOperations) {
-  ScopedDisableSyncFSV2 scoped_disable_v2;
-
-  EXPECT_EQ(base::File::FILE_OK,
-            file_system_.OpenFileSystem());
-
-  // Try some directory operations (which should fail).
-  EXPECT_EQ(base::File::FILE_ERROR_INVALID_OPERATION,
-            file_system_.CreateDirectory(URL("dir")));
-
-  // Set up another (non-syncable) local file system.
-  SandboxFileSystemTestHelper other_file_system_(
-      GURL("http://foo.com/"), fileapi::kFileSystemTypeTemporary);
-  other_file_system_.SetUp(file_system_.file_system_context());
-
-  // Create directory '/a' and file '/a/b' in the other file system.
-  const FileSystemURL kSrcDir = other_file_system_.CreateURLFromUTF8("/a");
-  const FileSystemURL kSrcChild = other_file_system_.CreateURLFromUTF8("/a/b");
-
-  EXPECT_EQ(base::File::FILE_OK,
-            content::AsyncFileTestHelper::CreateDirectory(
-                other_file_system_.file_system_context(), kSrcDir));
-  EXPECT_EQ(base::File::FILE_OK,
-            content::AsyncFileTestHelper::CreateFile(
-                other_file_system_.file_system_context(), kSrcChild));
-
-  // Now try copying the directory into the syncable file system, which should
-  // fail if directory operation is disabled. (http://crbug.com/161442)
-  EXPECT_NE(base::File::FILE_OK,
-            file_system_.Copy(kSrcDir, URL("dest")));
-
-  other_file_system_.TearDown();
-}
-
 }  // namespace sync_file_system