chromeos: Use RefreshEntry to implement DriveResourceMetadata::RenameEntry

chrome/browser/chromeos/drive/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/drive_resource_metadata.h"
 
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 571 matching lines @@
 
   DVLOG(1) << "RenameEntry " << file_path.value() << " to " << new_name;
   scoped_ptr<DriveEntryProto> entry = FindEntryByPathSync(file_path);
   if (!entry)
     return FileMoveResult(DRIVE_FILE_ERROR_NOT_FOUND);
 
   if (base::FilePath::FromUTF8Unsafe(new_name) == file_path.BaseName())
     return FileMoveResult(DRIVE_FILE_ERROR_EXISTS);
 
   entry->set_title(new_name);
-  storage_->PutEntry(*entry);
-
-  // After changing the title of the entry, call MoveEntryToDirectory to
-  // remove the entry from its parent directory and then add it back in order to
-  // go through the file name de-duplication.
-  // TODO(achuith/satorux/zel): This code is fragile. The title has been
-  // changed, but not the file_name. MoveEntryToDirectory calls RemoveChild to
-  // remove the child based on the old file_name, and then re-adds the child by
-  // first assigning the new title to file_name. http://crbug.com/30157
-  return MoveEntryToDirectoryOnBlockingPool(
-      file_path, GetFilePath(entry->parent_resource_id()));
+  scoped_ptr<GetEntryInfoWithFilePathResult> result =
+      RefreshEntryOnBlockingPool(*entry);
+  return FileMoveResult(result->error, result->path);
 }
 
 DriveResourceMetadata::FileMoveResult
 DriveResourceMetadata::RemoveEntryOnBlockingPool(
     const std::string& resource_id) {
   DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());
 
   // Disallow deletion of root.
   if (resource_id == root_resource_id_)
     return FileMoveResult(DRIVE_FILE_ERROR_ACCESS_DENIED);
@@ skipping 565 matching lines @@
   storage_->PutEntry(
       CreateEntryWithProperBaseName(proto.drive_directory().drive_entry()));
   AddDescendantsFromProto(proto.drive_directory());
 
   storage_->SetLargestChangestamp(proto.largest_changestamp());
 
   return true;
 }
 
 }  // namespace drive