chromeos: Change DriveResourceMetadata's method arguemnts from DriveEntryProto* to resource ID when…

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 266 matching lines @@
 
   // Searches for |file_path| synchronously.
   DriveEntryProto* FindEntryByPathSync(const base::FilePath& file_path);
 
   // Helper function to get a directory given |resource_id|. |resource_id| can
   // not be empty. Returns NULL if it finds no corresponding entry, or the
   // corresponding entry is not a directory.
   DriveEntryProto* GetDirectory(const std::string& resource_id);
 
   // Returns virtual file path of the entry.
-  base::FilePath GetFilePath(const DriveEntryProto& entry);
+  base::FilePath GetFilePath(const std::string& resource_id);
 
   // Recursively extracts the paths set of all sub-directories.
-  void GetDescendantDirectoryPaths(const DriveEntryProto& directory,
+  void GetDescendantDirectoryPaths(const std::string& resource_id,
                                    std::set<base::FilePath>* child_directories);
 
-  // Adds child file to the directory and takes over the ownership of |entry|
+  // Adds child file to its parent and takes over the ownership of |entry|
   // object. The method will also do name de-duplication to ensure that the
   // exposed presentation path does not have naming conflicts. Two files with
   // the same name "Foo" will be renames to "Foo (1)" and "Foo (2)".
-  void AddEntryToDirectory(DriveEntryProto* directory, DriveEntryProto* entry);
+  void AddEntryToDirectory(DriveEntryProto* entry);
 
-  // Removes the entry from its children list and destroys the entry instance.
-  void RemoveDirectoryChild(DriveEntryProto* directory, DriveEntryProto* entry);
+  // Removes the entry from its parent and destroys the entry instance.
+  void RemoveDirectoryChild(const std::string& child_resource_id);
 
   // Find a child's resource_id by its name. Returns the empty string if not
   // found.
-  std::string FindDirectoryChild(DriveEntryProto* directory,
+  std::string FindDirectoryChild(const std::string& directory_resource_id,
                                  const base::FilePath::StringType& file_name);
 
-  // Removes the entry from its children without destroying the
-  // entry instance.
-  void DetachEntryFromDirectory(DriveEntryProto* directory,
-                                DriveEntryProto* entry);
+  // Detaches the entry from its parent without destroying the entry instance.
+  void DetachEntryFromDirectory(const std::string& child_resource_id);
 
   // Removes child elements of directory.
-  void RemoveDirectoryChildren(DriveEntryProto* directory);
+  void RemoveDirectoryChildren(const std::string& directory_resource_id);
 
-  // Converts directory to proto, and vice versa.
-  void ProtoToDirectory(const DriveDirectoryProto& proto,
-                        DriveEntryProto* directory);
-  void DirectoryToProto(DriveEntryProto* directory,
+  // Sets up directory based on |proto|.
+  void ProtoToDirectory(const DriveDirectoryProto& proto);
+
+  // Converts directory to proto.
+  void DirectoryToProto(const std::string& directory_resource_id,
                         DriveDirectoryProto* proto);
 
   // Converts the children as a vector of DriveEntryProto.
   scoped_ptr<DriveEntryProtoVector> DirectoryChildrenToProtoVector(
-      DriveEntryProto* directory);
+      const std::string& directory_resource_id);
 
   // Private data members.
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   ResourceMap resource_map_;
 
   ChildMaps child_maps_;
 
   scoped_ptr<DriveEntryProto> root_;
 
   base::Time last_serialized_;
   size_t serialized_size_;
   int64 largest_changestamp_;  // Stored in the serialized proto.
   bool loaded_;
 
   // 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_