Replace GDataDirectory::TakeEntry with GDataDirectoryService::AddEntryToDirectory.

chrome/browser/chromeos/gdata/gdata_files.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_GDATA_GDATA_FILES_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_
 
 #include <map>
 #include <string>
 
@@ skipping 56 matching lines @@
 const char kGDataRootDirectoryResourceId[] = "folder:root";
 
 // This should be incremented when incompatibility change is made in
 // gdata.proto.
 const int32 kProtoVersion = 1;
 
 // Used for file operations like removing files.
 typedef base::Callback<void(GDataFileError error)>
     FileOperationCallback;
 
+// Callback similar to FileOperationCallback but with a given |file_path|.
+// Used for operations that change a file path like moving files.
+typedef base::Callback<void(GDataFileError error,
+                            const FilePath& file_path)>
+    FileMoveCallback;
+
 // Used to get entry info from the file system.
 // If |error| is not GDATA_FILE_OK, |entry_info| is set to NULL.
 typedef base::Callback<void(GDataFileError error,
                             scoped_ptr<GDataEntryProto> entry_proto)>
     GetEntryInfoCallback;
 
 // Used to read a directory from the file system.
 // If |error| is not GDATA_FILE_OK, |entries| is set to NULL.
 // |entries| are contents, both files and directories, of the directory.
 typedef std::vector<GDataEntryProto> GDataEntryProtoVector;
@@ skipping 22 matching lines @@
 };
 
 // Used to receive the result from GetEntryInfoPairCallback().
 typedef base::Callback<void(scoped_ptr<EntryInfoPairResult> pair_result)>
     GetEntryInfoPairCallback;
 
 // Base class for representing files and directories in gdata virtual file
 // system.
 class GDataEntry {
  public:
+  // TODO(achuith): Remove |parent| from ctor. crbug.com/141494
   GDataEntry(GDataDirectory* parent, GDataDirectoryService* directory_service);
   virtual ~GDataEntry();
 
   virtual GDataFile* AsGDataFile();
   virtual GDataDirectory* AsGDataDirectory();
 
   // const versions of AsGDataFile and AsGDataDirectory.
   const GDataFile* AsGDataFileConst() const;
   const GDataDirectory* AsGDataDirectoryConst() const;
 
@@ skipping 122 matching lines @@
 };
 
 typedef std::map<FilePath::StringType, GDataFile*> GDataFileCollection;
 typedef std::map<FilePath::StringType, GDataDirectory*>
     GDataDirectoryCollection;
 
 // Represents "file" in in a GData virtual file system. On gdata feed side,
 // this could be either a regular file or a server side document.
 class GDataFile : public GDataEntry {
  public:
+  // TODO(achuith): Remove |parent| from ctor. crbug.com/141494
   explicit GDataFile(GDataDirectory* parent,
                      GDataDirectoryService* directory_service);
   virtual ~GDataFile();
   virtual GDataFile* AsGDataFile() OVERRIDE;
 
   // Converts DocumentEntry into GDataEntry.
   static GDataEntry* FromDocumentEntry(
       GDataDirectory* parent,
       DocumentEntry* doc,
       GDataDirectoryService* directory_service);
@@ skipping 26 matching lines @@
   std::string document_extension_;
   bool is_hosted_document_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataFile);
 };
 
 // Represents "directory" in a GData virtual file system. Maps to gdata
 // collection element.
 class GDataDirectory : public GDataEntry {
  public:
+  // TODO(achuith): Remove |parent| from ctor. crbug.com/141494
   GDataDirectory(GDataDirectory* parent,
                  GDataDirectoryService* directory_service);
   virtual ~GDataDirectory();
   virtual GDataDirectory* AsGDataDirectory() OVERRIDE;
 
   // Converts DocumentEntry into GDataEntry.
   static GDataEntry* FromDocumentEntry(
       GDataDirectory* parent,
       DocumentEntry* doc,
       GDataDirectoryService* directory_service);
 
   // Converts to/from proto.
   bool FromProto(const GDataDirectoryProto& proto) WARN_UNUSED_RESULT;
   void ToProto(GDataDirectoryProto* proto) const;
 
   // Converts the children as a vector of GDataEntryProto.
   scoped_ptr<GDataEntryProtoVector> ToProtoVector() const;
 
-  // Removes child elements.
-  void RemoveChildren();
-  void RemoveChildFiles();
-  void RemoveChildDirectories();
-
   // Collection of children files/directories.
   const GDataFileCollection& child_files() const { return child_files_; }
   const GDataDirectoryCollection& child_directories() const {
     return child_directories_;
   }
 
  private:
   // TODO(satorux): Remove the friend statements. crbug.com/139649
   friend class GDataDirectoryService;
   friend class GDataFileSystem;
   friend class GDataWapiFeedProcessor;
 
   // Adds child file to the directory and takes over the ownership of |file|
   // 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)".
   // TODO(satorux): Remove this. crbug.com/139649
   void AddEntry(GDataEntry* entry);
 
   // Removes the entry from its children list and destroys the entry instance.
   // TODO(satorux): Remove this. crbug.com/139649
   void RemoveEntry(GDataEntry* entry);
 
-  // Takes the ownership of |entry| from its current parent. If this directory
-  // is already the current parent of |file|, this method effectively goes
-  // through the name de-duplication for |file| based on the current state of
-  // the file system.
-  // TODO(satorux): Remove this. crbug.com/139649
-  bool TakeEntry(GDataEntry* entry);
-
   // Takes over all entries from |dir|.
   // TODO(satorux): Remove this. crbug.com/139649
   bool TakeOverEntries(GDataDirectory* dir);
 
   // Find a child by its name.
   // TODO(satorux): Remove this. crbug.com/139649
   GDataEntry* FindChild(const FilePath::StringType& file_name) const;
 
   // Add |entry| to children.
   void AddChild(GDataEntry* entry);
 
   // Removes the entry from its children without destroying the
   // entry instance.
   void RemoveChild(GDataEntry* entry);
 
+  // Removes child elements.
+  void RemoveChildren();
+  void RemoveChildFiles();
+  void RemoveChildDirectories();
+
   // Collection of children GDataEntry items.
   GDataFileCollection child_files_;
   GDataDirectoryCollection child_directories_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectory);
 };
 
 // TODO(achuith,hashimoto,satorux): Move this to a separate file.
 // crbug.com/140317.
 // Class to handle GDataEntry* lookups, add/remove GDataEntry*.
@@ skipping 19 matching lines @@
 
   // Largest change timestamp that was the source of content for the current
   // state of the root directory.
   const int largest_changestamp() const { return largest_changestamp_; }
   void set_largest_changestamp(int value) { largest_changestamp_ = value; }
 
   // The root directory content origin.
   const ContentOrigin origin() const { return origin_; }
   void set_origin(ContentOrigin value) { origin_ = value; }
 
-  // Adds |entry| to |directory_path| asynchronously.
-  // Must be called on UI thread. |callback| is called on the UI thread.
-  void AddEntryToDirectory(const FilePath& directory_path,
-                           GDataEntry* entry,
-                           const FileOperationCallback& callback);
+  // Move |entry| to |directory_path| asynchronously. Removes entry from
+  // previous parent. Must be called on UI thread. |callback| is called on the
+  // UI thread.
+  void MoveEntryToDirectory(const FilePath& directory_path,
+                            GDataEntry* entry,
+                            const FileMoveCallback& callback);
 
   // Adds the entry to resource map.
   void AddEntryToResourceMap(GDataEntry* entry);
 
   // Removes the entry from resource map.
   void RemoveEntryFromResourceMap(GDataEntry* entry);
 
   // Searches for |file_path| synchronously.
   // TODO(satorux): Replace this with an async version crbug.com/137160
   GDataEntry* FindEntryByPathSync(const FilePath& file_path);
@@ skipping 101 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<GDataDirectoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectoryService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_