chromeos: Rewrite DriveResourceMetadata::MoveEntryToDirectory with RefreshEntry

chrome/browser/chromeos/drive/drive_resource_metadata.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 215 matching lines @@
 
   // Iterates over entries and runs |iterate_callback| for each entry with
   // |blocking_task_runner_|. Runs |completion_callback| after iterating over
   // all entries.
   void IterateEntries(const IterateCallback& iterate_callback,
                       const base::Closure& completion_callback);
 
  private:
   struct FileMoveResult;
   struct GetEntryInfoResult;
-  struct GetEntryInfoWithFilePathResult;
   struct ReadDirectoryResult;
 
   // Note: Use Destroy() to delete this object.
   virtual ~DriveResourceMetadata();
 
   // Used to implement Initialize();
   FileError InitializeOnBlockingPool() WARN_UNUSED_RESULT;
 
   // Sets up entries which should be present by default.
   void SetUpDefaultEntries();
@@ skipping 19 matching lines @@
       const base::FilePath& directory_path);
 
   // Used to implement RenameEntry().
   FileMoveResult RenameEntryOnBlockingPool(const base::FilePath& file_path,
                                            const std::string& new_name);
 
   // Used to implement RemoveEntry().
   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(
       const base::FilePath& file_path);
 
   // Used to implement ReadDirectoryByPath().
   scoped_ptr<ReadDirectoryResult> ReadDirectoryByPathOnBlockingPool(
       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(
       const DirectoryFetchInfo& directory_fetch_info,
       const DriveEntryProtoMap& entry_proto_map);
 
   // Used to implement GetChildDirectories().
   scoped_ptr<std::set<base::FilePath> > GetChildDirectoriesOnBlockingPool(
       const std::string& resource_id);
 
@@ skipping 66 matching lines @@
   // This should remain the last member so it'll be destroyed first and
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<DriveResourceMetadata> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveResourceMetadata);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_RESOURCE_METADATA_H_