SyncFS: Fix up DCHECK failures

chrome/browser/sync_file_system/drive_file_sync_service.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_file_sync_service.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 1208 matching lines @@
       return LOCAL_SYNC_OPERATION_RESOLVE_TO_REMOTE;
     NOTREACHED();
     return LOCAL_SYNC_OPERATION_FAIL;
   }
 
   RemoteChange remote_change;
   const bool has_remote_change = GetPendingChangeForFileSystemURL(
       url, &remote_change);
 
   if (has_remote_change) {
-    if (param && !has_metadata)
+    if (param && param->drive_metadata.resource_id().empty())
       param->drive_metadata.set_resource_id(remote_change.resource_id);
 
     // Remote change for the file identified by |url| exists in the pending
     // change queue.
     const FileChange& remote_file_change = remote_change.change;
 
     // (RemoteChange) + (LocalChange) -> (Operation Type)
     // AddOrUpdate    + AddOrUpdate   -> CONFLICT
     // AddOrUpdate    + Delete        -> NONE
     // Delete         + AddOrUpdate   -> ADD
@@ skipping 57 matching lines @@
   NotifyTaskDone(status, token.Pass());
   callback.Run(status);
 }
 
 void DriveFileSyncService::DidUploadNewFileForLocalSync(
     scoped_ptr<ApplyLocalChangeParam> param,
     google_apis::GDataErrorCode error,
     const std::string& resource_id,
     const std::string& file_md5) {
   DCHECK(param);
-  DCHECK(!param->has_drive_metadata);
   const FileSystemURL& url = param->url;
   if (error == google_apis::HTTP_CREATED) {
     param->drive_metadata.set_resource_id(resource_id);
     param->drive_metadata.set_md5_checksum(file_md5);
     param->drive_metadata.set_conflicted(false);
     param->drive_metadata.set_to_be_fetched(false);
     const DriveMetadata& metadata = param->drive_metadata;
     metadata_store_->UpdateEntry(
         url, metadata,
         base::Bind(&DriveFileSyncService::DidApplyLocalChange,
@@ skipping 1143 matching lines @@
       pending_batch_sync_origins_.insert(origin);
   }
   callback.Run(status, resource_id);
 }
 
 std::string DriveFileSyncService::sync_root_resource_id() {
   return metadata_store_->sync_root_directory();
 }
 
 }  // namespace sync_file_system