drive: Stop using FileCacheEntry related methods in FileCache

chrome/browser/chromeos/drive/resource_metadata.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/resource_metadata.h"
 
 #include "base/guid.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 369 matching lines @@
 
   // Make sure that the new parent exists and it is a directory.
   ResourceEntry new_parent;
   error = storage_->GetEntry(entry.parent_local_id(), &new_parent);
   if (error != FILE_ERROR_OK)
     return error;
 
   if (!new_parent.file_info().is_directory())
     return FILE_ERROR_NOT_A_DIRECTORY;
 
+  // Do not overwrite cache states.
+  // Cache state should be changed via FileCache.
+  ResourceEntry updated_entry(entry);
+  if (old_entry.file_specific_info().has_cache_state()) {
+    *updated_entry.mutable_file_specific_info()->mutable_cache_state() =
+        old_entry.file_specific_info().cache_state();
+  } else if (updated_entry.file_specific_info().has_cache_state()) {
+    updated_entry.mutable_file_specific_info()->clear_cache_state();
+  }
   // Remove from the old parent and add it to the new parent with the new data.
-  return PutEntryUnderDirectory(entry);
+  return PutEntryUnderDirectory(updated_entry);
 }
 
 FileError ResourceMetadata::GetSubDirectoriesRecursively(
     const std::string& id,
     std::set<base::FilePath>* sub_directories) {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   std::vector<std::string> children;
   FileError error = storage_->GetChildren(id, &children);
   if (error != FILE_ERROR_OK)
@@ skipping 182 matching lines @@
 
   error = cache_->Remove(id);
   if (error != FILE_ERROR_OK)
     return error;
 
   return storage_->RemoveEntry(id);
 }
 
 }  // namespace internal
 }  // namespace drive