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..8147163a7db5fe0f2951d332e57fc0b76e8d999c 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_EQ(DriveMetadata::FILE, param->drive_metadata.type()); |
kinuko
2013/04/16 12:10:19
It feels slightly weird to have these occasional D
nhiroki
2013/04/17 02:24:51
Okay, recalled them for now.
|
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_type(DriveMetadata::FILE); |
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_type(DriveMetadata::FILE); |
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_EQ(DriveMetadata::FILE, drive_metadata->type()); |
+ |
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. |