[SyncFS] Implement non-conflict local folder addition.

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc

 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h"
 
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 149 matching lines @@
         remote_file_tracker_->synced_details().etag(),
         base::Bind(&LocalToRemoteSyncer::DidDeleteRemoteFile,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback));
     return;
   }
 
   DCHECK(local_change_.IsAddOrUpdate());
   DCHECK(local_change_.file_type() == SYNC_FILE_TYPE_FILE ||
          local_change_.file_type() == SYNC_FILE_TYPE_DIRECTORY);
+
+  const FileDetails& synced_details = remote_file_tracker_->synced_details();
+  DCHECK(synced_details.file_kind() == FILE_KIND_FILE ||
+         synced_details.file_kind() == FILE_KIND_FOLDER);
   if (local_change_.file_type() == SYNC_FILE_TYPE_FILE) {
-    UploadExistingFile(callback);
+    if (synced_details.file_kind() == FILE_KIND_FILE) {
+      // Non-conflicting local file update to existing remote regular file.
+      UploadExistingFile(callback);
+      return;
+    }
+
+    DCHECK_EQ(FILE_KIND_FOLDER, synced_details.file_kind());
+    // Non-conflicting local file update to existing remote *folder*.
+    // Our policy prioritize the folder on this case.
+    // Do nothing to remote folder and mark the tracker dirty to defer it to
+    // next remote-to-local sync phase.
+    metadata_database()->MarkTrackerDirty(remote_file_tracker_->tracker_id(),
+                                          callback);
     return;
   }
 
-  NOTIMPLEMENTED();
-  callback.Run(SYNC_STATUS_FAILED);
+  DCHECK_EQ(SYNC_FILE_TYPE_DIRECTORY, local_change_.file_type());
+  if (synced_details.file_kind() == FILE_KIND_FILE) {
+    // Non-conflicting local folder creation to existing remote *file*.
+    // Our policy prioritize the folder on this case.
+    // TODO(tzik): Delete remote file and create a folder at the path.
+    NOTIMPLEMENTED();
+    callback.Run(SYNC_STATUS_FAILED);
+    return;
+  }
+
+  // Non-conflicting local folder creation to existing remote folder.
+  DCHECK_EQ(FILE_KIND_FOLDER, synced_details.file_kind());
+  callback.Run(SYNC_STATUS_OK);
 }
 
 void LocalToRemoteSyncer::DidDeleteRemoteFile(
     const SyncStatusCallback& callback,
     google_apis::GDataErrorCode error) {
   if (error != google_apis::HTTP_SUCCESS &&
       error != google_apis::HTTP_NOT_FOUND &&
       error != google_apis::HTTP_PRECONDITION) {
     callback.Run(GDataErrorCodeToSyncStatusCode(error));
     return;
@@ skipping 90 matching lines @@
 drive::DriveUploaderInterface* LocalToRemoteSyncer::drive_uploader() {
   return sync_context_->GetDriveUploader();
 }
 
 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system