SyncFS: Always normalize paths with FileSystemURL's ctor *and* GetNormalizedFilePath

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 1964 matching lines @@
     const std::string& remote_resource_id,
     int64 changestamp,
     const std::string& remote_file_md5,
     const base::Time& updated_time,
     SyncFileType file_type,
     RemoteSyncType sync_type) {
   fileapi::FileSystemURL url(
       CreateSyncableFileSystemURL(origin, kServiceName, path));
   DCHECK(url.is_valid());
 
+  // Note that we create a normalized path from url.path() rather than
+  // path here (as FileSystemURL does extra normalization).
+  base::FilePath::StringType normalized_path =
+    fileapi::VirtualPath::GetNormalizedFilePath(url.path());
+
   std::string local_resource_id;
   std::string local_file_md5;
 
   DriveMetadata metadata;
   bool has_db_entry =
       (metadata_store_->ReadEntry(url, &metadata) == SYNC_STATUS_OK);
   if (has_db_entry) {
     local_resource_id = metadata.resource_id();
     if (!metadata.to_be_fetched())
       local_file_md5 = metadata.md5_checksum();
   }
 
   PathToChangeMap* path_to_change = &origin_to_changes_map_[origin];
-  PathToChangeMap::iterator found =
-      path_to_change->find(fileapi::VirtualPath::GetNormalizedFilePath(path));
+  PathToChangeMap::iterator found = path_to_change->find(normalized_path);
   PendingChangeQueue::iterator overridden_queue_item = pending_changes_.end();
   if (found != path_to_change->end()) {
     if (found->second.changestamp >= changestamp)
       return false;
     const RemoteChange& pending_change = found->second;
     overridden_queue_item = pending_change.position_in_queue;
 
     if (pending_change.change.IsDelete()) {
       local_resource_id.clear();
       local_file_md5.clear();
@@ skipping 44 matching lines @@
 
   // Do not return in this block. These changes should be done together.
   {
     if (overridden_queue_item != pending_changes_.end())
       pending_changes_.erase(overridden_queue_item);
 
     std::pair<PendingChangeQueue::iterator, bool> inserted_to_queue =
         pending_changes_.insert(ChangeQueueItem(changestamp, sync_type, url));
     DCHECK(inserted_to_queue.second);
 
-    (*path_to_change)[fileapi::VirtualPath::GetNormalizedFilePath(path)] =
+    (*path_to_change)[normalized_path] =
         RemoteChange(
             changestamp, remote_resource_id, remote_file_md5,
             updated_time, sync_type, url, file_change,
             inserted_to_queue.first);
   }
 
   DVLOG(3) << "Append remote change: " << path.value()
+           << " (" << normalized_path << ")"
            << "@" << changestamp << " "
            << file_change.DebugString();
 
   return true;
 }
 
 void DriveFileSyncService::RemoveRemoteChange(
     const FileSystemURL& url) {
   OriginToChangesMap::iterator found_origin =
       origin_to_changes_map_.find(url.origin());
@@ skipping 329 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