Final patch to migrate all files under webkit/fileapi/syncable from fileapi namespace to sync_file_system namespace.

BUG=174870

Review URL: https://codereview.chromium.org/12313144

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184928 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 48 insertions, 51 deletions

diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
index cf62cbf..9273a7b 100644
--- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -28,20 +28,17 @@
 
 #define FPL FILE_PATH_LITERAL
 
+using fileapi::FileSystemContext;
+using fileapi::FileSystemURL;
+using fileapi::FileSystemURLSet;
+
 // This tests LocalFileSyncContext behavior in multi-thread /
 // multi-file-system-context environment.
 // Basic combined tests (single-thread / single-file-system-context)
 // that involve LocalFileSyncContext are also in
 // syncable_file_system_unittests.cc.
 
-using sync_file_system::FileChange;
-using sync_file_system::FileChangeList;
-using sync_file_system::LocalFileSyncInfo;
-using sync_file_system::SyncFileMetadata;
-using sync_file_system::SyncFileType;
-using sync_file_system::SyncStatusCode;
-
-namespace fileapi {
+namespace sync_file_system {
 
 namespace {
 const char kOrigin1[] = "http://example.com";
@@ -52,13 +49,13 @@ const char kServiceName[] = "test";
 class LocalFileSyncContextTest : public testing::Test {
  protected:
   LocalFileSyncContextTest()
-      : status_(sync_file_system::SYNC_FILE_ERROR_FAILED),
+      : status_(SYNC_FILE_ERROR_FAILED),
         file_error_(base::PLATFORM_FILE_ERROR_FAILED),
         async_modify_finished_(false),
         has_inflight_prepare_for_sync_(false) {}
 
   virtual void SetUp() OVERRIDE {
-    EXPECT_TRUE(fileapi::RegisterSyncableFileSystem(kServiceName));
+    EXPECT_TRUE(RegisterSyncableFileSystem(kServiceName));
 
     io_thread_.reset(new base::Thread("Thread_IO"));
     io_thread_->StartWithOptions(
@@ -73,7 +70,7 @@ class LocalFileSyncContextTest : public testing::Test {
   }
 
   virtual void TearDown() OVERRIDE {
-    EXPECT_TRUE(fileapi::RevokeSyncableFileSystem(kServiceName));
+    EXPECT_TRUE(RevokeSyncableFileSystem(kServiceName));
     io_thread_->Stop();
     file_thread_->Stop();
   }
@@ -84,7 +81,7 @@ class LocalFileSyncContextTest : public testing::Test {
                            FileChangeList* changes) {
     ASSERT_TRUE(changes != NULL);
     ASSERT_FALSE(has_inflight_prepare_for_sync_);
-    status_ = sync_file_system::SYNC_STATUS_UNKNOWN;
+    status_ = SYNC_STATUS_UNKNOWN;
     has_inflight_prepare_for_sync_ = true;
     sync_context_->PrepareForSync(
         file_system_context,
@@ -135,11 +132,11 @@ class LocalFileSyncContextTest : public testing::Test {
     // First we should call PrepareForSync to disable writing.
     SyncFileMetadata metadata;
     FileChangeList changes;
-    EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+    EXPECT_EQ(SYNC_STATUS_OK,
               PrepareForSync(file_system_context, url, &metadata, &changes));
     EXPECT_EQ(expected_file_type, metadata.file_type);
 
-    status_ = sync_file_system::SYNC_STATUS_UNKNOWN;
+    status_ = SYNC_STATUS_UNKNOWN;
     sync_context_->ApplyRemoteChange(
         file_system_context, change, local_path, url,
         base::Bind(&LocalFileSyncContextTest::DidApplyRemoteChange,
@@ -223,7 +220,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
   sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
 
   // Initializes file_system using |sync_context_|.
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             file_system.MaybeInitializeFileSystemContext(sync_context_));
 
   // Make sure everything's set up for file_system to be able to handle
@@ -234,7 +231,7 @@ TEST_F(LocalFileSyncContextTest, InitializeFileSystemContext) {
             file_system.file_system_context()->sync_context());
 
   // Calling MaybeInitialize for the same context multiple times must be ok.
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             file_system.MaybeInitializeFileSystemContext(sync_context_));
   EXPECT_EQ(sync_context_.get(),
             file_system.file_system_context()->sync_context());
@@ -267,9 +264,9 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
   sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
 
   // Initializes file_system1 and file_system2.
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             file_system1.MaybeInitializeFileSystemContext(sync_context_));
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             file_system2.MaybeInitializeFileSystemContext(sync_context_));
 
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system1.OpenFileSystem());
@@ -309,23 +306,23 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
 
   SyncFileMetadata metadata;
   FileChangeList changes;
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             PrepareForSync(file_system1.file_system_context(), kURL1,
                            &metadata, &changes));
   EXPECT_EQ(1U, changes.size());
   EXPECT_TRUE(changes.list().back().IsFile());
   EXPECT_TRUE(changes.list().back().IsAddOrUpdate());
-  EXPECT_EQ(sync_file_system::SYNC_FILE_TYPE_FILE, metadata.file_type);
+  EXPECT_EQ(SYNC_FILE_TYPE_FILE, metadata.file_type);
   EXPECT_EQ(0, metadata.size);
 
   changes.clear();
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             PrepareForSync(file_system2.file_system_context(), kURL2,
                            &metadata, &changes));
   EXPECT_EQ(1U, changes.size());
   EXPECT_FALSE(changes.list().back().IsFile());
   EXPECT_TRUE(changes.list().back().IsAddOrUpdate());
-  EXPECT_EQ(sync_file_system::SYNC_FILE_TYPE_DIRECTORY, metadata.file_type);
+  EXPECT_EQ(SYNC_FILE_TYPE_DIRECTORY, metadata.file_type);
   EXPECT_EQ(0, metadata.size);
 
   sync_context_->ShutdownOnUIThread();
@@ -340,7 +337,7 @@ TEST_F(LocalFileSyncContextTest, PrepareSyncWhileWriting) {
                                        io_task_runner_, file_task_runner_);
   file_system.SetUp();
   sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+  EXPECT_EQ(SYNC_STATUS_OK,
             file_system.MaybeInitializeFileSystemContext(sync_context_));
 
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
@@ -355,17 +352,17 @@ TEST_F(LocalFileSyncContextTest, PrepareSyncWhileWriting) {
 
   // Until the operation finishes PrepareForSync should return BUSY error.
   SyncFileMetadata metadata;
-  metadata.file_type = sync_file_system::SYNC_FILE_TYPE_UNKNOWN;
+  metadata.file_type = SYNC_FILE_TYPE_UNKNOWN;
   FileChangeList changes;
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_FILE_BUSY,
+  EXPECT_EQ(SYNC_STATUS_FILE_BUSY,
             PrepareForSync(file_system.file_system_context(),
                            kURL1, &metadata, &changes));
-  EXPECT_EQ(sync_file_system::SYNC_FILE_TYPE_FILE, metadata.file_type);
+  EXPECT_EQ(SYNC_FILE_TYPE_FILE, metadata.file_type);
 
   // Register PrepareForSync method to be invoked when kURL1 becomes
   // syncable. (Actually this may be done after all operations are done
   // on IO thread in this test.)
-  metadata.file_type = sync_file_system::SYNC_FILE_TYPE_UNKNOWN;
+  metadata.file_type = SYNC_FILE_TYPE_UNKNOWN;
   changes.clear();
   sync_context_->RegisterURLForWaitingSync(
       kURL1, GetPrepareForSyncClosure(file_system.file_system_context(),
@@ -380,11 +377,11 @@ TEST_F(LocalFileSyncContextTest, PrepareSyncWhileWriting) {
   ASSERT_FALSE(has_inflight_prepare_for_sync_);
 
   // Now PrepareForSync should have run and returned OK.
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK, status_);
+  EXPECT_EQ(SYNC_STATUS_OK, status_);
   EXPECT_EQ(1U, changes.size());
   EXPECT_TRUE(changes.list().back().IsFile());
   EXPECT_TRUE(changes.list().back().IsAddOrUpdate());
-  EXPECT_EQ(sync_file_system::SYNC_FILE_TYPE_FILE, metadata.file_type);
+  EXPECT_EQ(SYNC_FILE_TYPE_FILE, metadata.file_type);
   EXPECT_EQ(1, metadata.size);
 
   sync_context_->ShutdownOnUIThread();
@@ -398,7 +395,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) {
   file_system.SetUp();
 
   sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
-  ASSERT_EQ(sync_file_system::SYNC_STATUS_OK,
+  ASSERT_EQ(SYNC_STATUS_OK,
             file_system.MaybeInitializeFileSystemContext(sync_context_));
   ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
 
@@ -437,20 +434,20 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) {
 
   // Now let's apply remote deletion changes.
   FileChange change(FileChange::FILE_CHANGE_DELETE,
-                    sync_file_system::SYNC_FILE_TYPE_FILE);
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+                    SYNC_FILE_TYPE_FILE);
+  EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, base::FilePath(), kFile,
-                              sync_file_system::SYNC_FILE_TYPE_FILE));
+                              SYNC_FILE_TYPE_FILE));
 
   // The implementation doesn't check file type for deletion, and it must be ok
   // even if we don't know if the deletion change was for a file or a directory.
   change = FileChange(FileChange::FILE_CHANGE_DELETE,
-                      sync_file_system::SYNC_FILE_TYPE_UNKNOWN);
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+                      SYNC_FILE_TYPE_UNKNOWN);
+  EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, base::FilePath(), kDir,
-                              sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
+                              SYNC_FILE_TYPE_DIRECTORY));
 
   // Check the directory/files are deleted successfully.
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
@@ -485,7 +482,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
   file_system.SetUp();
 
   sync_context_ = new LocalFileSyncContext(ui_task_runner_, io_task_runner_);
-  ASSERT_EQ(sync_file_system::SYNC_STATUS_OK,
+  ASSERT_EQ(SYNC_STATUS_OK,
             file_system.MaybeInitializeFileSystemContext(sync_context_));
   ASSERT_EQ(base::PLATFORM_FILE_OK, file_system.OpenFileSystem());
 
@@ -547,11 +544,11 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
 
   // Apply the remote change to kFile1 (which will update the file).
   FileChange change(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-                    sync_file_system::SYNC_FILE_TYPE_FILE);
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+                    SYNC_FILE_TYPE_FILE);
+  EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, kFilePath1, kFile1,
-                              sync_file_system::SYNC_FILE_TYPE_FILE));
+                              SYNC_FILE_TYPE_FILE));
 
   // Check if the usage has been increased by (kTestFileData1 - kTestFileData0).
   const int updated_size =
@@ -564,29 +561,29 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
   // directory respectively).
   // They are non-existent yet so their expected file type (the last
   // parameter of ApplyRemoteChange) are
-  // sync_file_system::SYNC_FILE_TYPE_UNKNOWN.
+  // SYNC_FILE_TYPE_UNKNOWN.
   change = FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-                      sync_file_system::SYNC_FILE_TYPE_FILE);
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+                      SYNC_FILE_TYPE_FILE);
+  EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, kFilePath2, kFile2,
-                              sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
+                              SYNC_FILE_TYPE_UNKNOWN));
 
   change = FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-                      sync_file_system::SYNC_FILE_TYPE_DIRECTORY);
-  EXPECT_EQ(sync_file_system::SYNC_STATUS_OK,
+                      SYNC_FILE_TYPE_DIRECTORY);
+  EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, base::FilePath(), kDir,
-                              sync_file_system::SYNC_FILE_TYPE_UNKNOWN));
+                              SYNC_FILE_TYPE_UNKNOWN));
 
   // This should not happen, but calling ApplyRemoteChange
   // with wrong file type will result in error.
   change = FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-                      sync_file_system::SYNC_FILE_TYPE_FILE);
-  EXPECT_NE(sync_file_system::SYNC_STATUS_OK,
+                      SYNC_FILE_TYPE_FILE);
+  EXPECT_NE(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, kFilePath1, kDir,
-                              sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
+                              SYNC_FILE_TYPE_DIRECTORY));
 
   // Creating a file/directory must have increased the usage more than
   // the size of kTestFileData2.
@@ -611,4 +608,4 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) {
   file_system.TearDown();
 }
 
-}  // namespace fileapi
+}  // namespace sync_file_system