chromeos: Rewrite DriveResourceMetadata::MoveEntryToDirectory with RefreshEntry

chrome/browser/chromeos/drive/drive_resource_metadata.h

Index: chrome/browser/chromeos/drive/drive_resource_metadata.h
diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.h b/chrome/browser/chromeos/drive/drive_resource_metadata.h
index 9924947e13a66ce2ca1fdd1fa312b2b6f1a35629..1334deb8cac2054914469548263233a542d0ef97 100644
--- a/chrome/browser/chromeos/drive/drive_resource_metadata.h
+++ b/chrome/browser/chromeos/drive/drive_resource_metadata.h
@@ -233,7 +233,6 @@ class DriveResourceMetadata {
  private:
   struct FileMoveResult;
   struct GetEntryInfoResult;
-  struct GetEntryInfoWithFilePathResult;
   struct ReadDirectoryResult;
 
   // Note: Use Destroy() to delete this object.
@@ -273,8 +272,10 @@ class DriveResourceMetadata {
   FileMoveResult RemoveEntryOnBlockingPool(const std::string& resource_id);
 
   // Used to implement GetEntryInfoByResourceId().
-  scoped_ptr<GetEntryInfoWithFilePathResult>
-      GetEntryInfoByResourceIdOnBlockingPool(const std::string& resource_id);
+  FileError GetEntryInfoByResourceIdOnBlockingPool(
+      const std::string& resource_id,
+      base::FilePath* out_file_path,
+      DriveEntryProto* out_entry);
 
   // Used to implement GetEntryInfoByPath().
   scoped_ptr<GetEntryInfoResult> GetEntryInfoByPathOnBlockingPool(
@@ -285,8 +286,9 @@ class DriveResourceMetadata {
       const base::FilePath& file_path);
 
   // Used to implement RefreshEntry().
-  scoped_ptr<GetEntryInfoWithFilePathResult> RefreshEntryOnBlockingPool(
-      const DriveEntryProto& entry_proto);
+  FileError RefreshEntryOnBlockingPool(const DriveEntryProto& entry_proto,
+                                       base::FilePath* out_file_path,
+                                       DriveEntryProto* out_entry);
 
   // Used to implement RefreshDirectory().
   FileMoveResult RefreshDirectoryOnBlockingPool(