SyncFS: Add resource type field into DriveMetadata

chrome/browser/sync_file_system/drive_metadata_store.cc

Index: chrome/browser/sync_file_system/drive_metadata_store.cc
diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc
index 27a370a820a37cb38a55d231ee3ea1c42e94bfd2..009d6b4ef341d6809ab403c1035cf3bdb806aee1 100644
--- a/chrome/browser/sync_file_system/drive_metadata_store.cc
+++ b/chrome/browser/sync_file_system/drive_metadata_store.cc
@@ -694,6 +694,10 @@ SyncStatusCode DriveMetadataStore::GetConflictURLs(
          itr != origin_itr->second.end();
          ++itr) {
       if (itr->second.conflicted()) {
+        // Directory conflict should be resolved automatically for now.
+        // TODO(nhiroki): support manual conflict handling for directory
+        // operations (http://crbug.com/231827)
+        DCHECK(!itr->second.is_folder());
         urls->insert(CreateSyncableFileSystemURL(
             origin_itr->first, kServiceName, itr->first));
       }