SyncFS: Add resource type field into DriveMetadata

chrome/browser/sync_file_system/drive_metadata_store.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 "chrome/browser/sync_file_system/drive_metadata_store.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 676 matching lines @@
   DCHECK_EQ(SYNC_STATUS_OK, db_status_);
 
   urls->clear();
   for (MetadataMap::const_iterator origin_itr = metadata_map_.begin();
        origin_itr != metadata_map_.end();
        ++origin_itr) {
     for (PathToMetadata::const_iterator itr = origin_itr->second.begin();
          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));
       }
     }
   }
   return SYNC_STATUS_OK;
 }
 
 SyncStatusCode DriveMetadataStore::GetToBeFetchedFiles(
     URLAndResourceIdList* list) const {
@@ skipping 472 matching lines @@
     DCHECK(origin.is_valid());
     bool result = disabled_origins->insert(
         std::make_pair(origin, itr->value().ToString())).second;
     DCHECK(result);
   }
 
   return SYNC_STATUS_OK;
 }
 
 }  // namespace sync_file_system