drive: Repect argument MD5 in FileCache::MarkDirty

chrome/browser/chromeos/drive/file_cache.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/chromeos/drive/file_cache.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 478 matching lines @@
   AssertOnSequencedWorkerPool();
 
   // If file has already been marked dirty in previous instance of chrome, we
   // would have lost the md5 info during cache initialization, because the file
   // would have been renamed to .local extension.
   // So, search for entry in cache without comparing md5.
 
   // Marking a file dirty means its entry and actual file blob must exist in
   // cache.
   FileCacheEntry cache_entry;
-  if (!storage_->GetCacheEntry(resource_id, &cache_entry) ||
+  if (!GetCacheEntry(resource_id, md5, &cache_entry) ||
       !cache_entry.is_present()) {
     LOG(WARNING) << "Can't mark dirty a file that wasn't cached: res_id="
                  << resource_id
                  << ", md5=" << md5;
     return FILE_ERROR_NOT_FOUND;
   }
 
   if (cache_entry.is_dirty())
     return FILE_ERROR_OK;
 
   // Get the current path of the file in cache.
-  base::FilePath source_path = GetCacheFilePath(resource_id, md5,
+  base::FilePath source_path = GetCacheFilePath(resource_id, cache_entry.md5(),
                                                 CACHED_FILE_FROM_SERVER);
   // Determine destination path.
   base::FilePath cache_file_path = GetCacheFilePath(
-      resource_id, md5, CACHED_FILE_LOCALLY_MODIFIED);
+      resource_id, cache_entry.md5(), CACHED_FILE_LOCALLY_MODIFIED);
 
   if (!MoveFile(source_path, cache_file_path))
     return FILE_ERROR_FAILED;
 
   // Now that file operations have completed, update metadata.
-  cache_entry.set_md5(md5);
   cache_entry.set_is_dirty(true);
   storage_->PutCacheEntry(resource_id, cache_entry);
   return FILE_ERROR_OK;
 }
 
 FileError FileCache::ClearDirty(const std::string& resource_id,
                                 const std::string& md5) {
   AssertOnSequencedWorkerPool();
 
   // |md5| is the new .<md5> extension to rename the file to.
@@ skipping 299 matching lines @@
     }
   }
 
   // Delete old DB.
   base::Delete(old_db_path, true /* recursive */ );
   return imported;
 }
 
 }  // namespace internal
 }  // namespace drive