[SyncFileSystem] Remove existing entry on LocalFileSyncContext::ApplyRemoteChange call.

webkit/fileapi/syncable/local_file_sync_context_unittest.cc

 // 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.
 
 #include "webkit/fileapi/syncable/local_file_sync_context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 558 matching lines @@
                               change, kFilePath2, kFile2,
                               SYNC_FILE_TYPE_UNKNOWN));
 
   change = FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                       SYNC_FILE_TYPE_DIRECTORY);
   EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
                               change, base::FilePath(), kDir,
                               SYNC_FILE_TYPE_UNKNOWN));
 
-  // This should not happen, but calling ApplyRemoteChange
-  // with wrong file type will result in error.
+  // Calling ApplyRemoteChange with different file type should be handled as
+  // overwrite.
+  change =
+      FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE);
+  EXPECT_EQ(SYNC_STATUS_OK,
+            ApplyRemoteChange(file_system.file_system_context(),
+                              change,
+                              kFilePath1,
+                              kDir,
+                              SYNC_FILE_TYPE_DIRECTORY));

[kinuko, 2013/04/30 13:31:09]

Can we check FileExists(kDir) here?

[tzik, 2013/04/30 13:54:40]

Done.

   change = FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
-                      SYNC_FILE_TYPE_FILE);
-  EXPECT_NE(SYNC_STATUS_OK,
+                      SYNC_FILE_TYPE_DIRECTORY);
+  EXPECT_EQ(SYNC_STATUS_OK,
             ApplyRemoteChange(file_system.file_system_context(),
-                              change, kFilePath1, kDir,
-                              SYNC_FILE_TYPE_DIRECTORY));
+                              change,
+                              kFilePath1,
+                              kDir,
+                              SYNC_FILE_TYPE_FILE));
 
   // Creating a file/directory must have increased the usage more than
   // the size of kTestFileData2.
   new_usage = usage;
   EXPECT_EQ(quota::kQuotaStatusOk,
             file_system.GetUsageAndQuota(&new_usage, &quota));
   EXPECT_GT(new_usage,
             static_cast<int64>(usage + arraysize(kTestFileData2) - 1));
 
   // The changes applied by ApplyRemoteChange should not be recorded in
@@ skipping 56 matching lines @@
 
   // Make sure kDir and kFile are created by ApplyRemoteChange.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system.FileExists(kFile));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system.DirectoryExists(kDir));
 
   sync_context_->ShutdownOnUIThread();
   file_system.TearDown();
 }
 
 }  // namespace sync_file_system