SyncFS: Add resource type field into DriveMetadata

chrome/browser/sync_file_system/drive_file_sync_service.cc

Index: chrome/browser/sync_file_system/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index 5399163bc8f5758ddcd27e41b46ff852df117308..d63b4ca947e9a19d9fc1d5b3542c48d6706c80ee 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -1138,6 +1138,7 @@ void DriveFileSyncService::ApplyLocalChangeInternal(
     }
     case LOCAL_SYNC_OPERATION_UPDATE: {
       DCHECK(param->has_drive_metadata);
+      DCHECK(!param->drive_metadata.is_folder());
       sync_client_->UploadExistingFile(
           drive_metadata.resource_id(),
           drive_metadata.md5_checksum(),
@@ -1293,6 +1294,7 @@ void DriveFileSyncService::DidUploadNewFileForLocalSync(
     param->drive_metadata.set_md5_checksum(file_md5);
     param->drive_metadata.set_conflicted(false);
     param->drive_metadata.set_to_be_fetched(false);
+    param->drive_metadata.set_is_folder(false);
     const DriveMetadata& metadata = param->drive_metadata;
     metadata_store_->UpdateEntry(
         url, metadata,
@@ -1322,6 +1324,7 @@ void DriveFileSyncService::DidUploadExistingFileForLocalSync(
       param->drive_metadata.set_md5_checksum(file_md5);
       param->drive_metadata.set_conflicted(false);
       param->drive_metadata.set_to_be_fetched(false);
+      param->drive_metadata.set_is_folder(false);
       const DriveMetadata& metadata = param->drive_metadata;
       metadata_store_->UpdateEntry(
           url, metadata,
@@ -2084,6 +2087,11 @@ void DriveFileSyncService::MarkConflict(
     DriveMetadata* drive_metadata,
     const SyncStatusCallback& callback) {
   DCHECK(drive_metadata);
+  // For now conflict involving directories should be resolved automatically.
+  // TODO(nhiroki): support manual conflict handling for directory operations.
+  // (http://crbug.com/231827)
+  DCHECK(!drive_metadata->is_folder());
+
   if (drive_metadata->resource_id().empty()) {
     // If the file does not have valid drive_metadata in the metadata store
     // we must have a pending remote change entry.