AddEntryToDirectory now takes a FilePath and scoped_ptr<DocumentEntry>

chrome/browser/chromeos/gdata/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_GDATA_DRIVE_RESOURCE_METADATA_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_RESOURCE_METADATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 46 matching lines @@
 const FilePath::CharType kDriveRootDirectory[] = FILE_PATH_LITERAL("drive");
 
 // The resource ID for the root directory is defined in the spec:
 // https://developers.google.com/google-apps/documents-list/
 const char kDriveRootDirectoryResourceId[] = "folder:root";
 
 // This should be incremented when incompatibility change is made in
 // drive.proto.
 const int32 kProtoVersion = 2;
 
-// Callback type used to get result of file search.
-// If |error| is not PLATFORM_FILE_OK, |entry| is set to NULL.
-typedef base::Callback<void(DriveFileError error, DriveEntry* entry)>
-    FindEntryCallback;
-
 // Used for file operations like removing files.
 typedef base::Callback<void(DriveFileError 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(DriveFileError error,
                             const FilePath& file_path)>
     FileMoveCallback;
 
@@ skipping 79 matching lines @@
 
   // Creates a DriveFile instance.
   DriveFile* CreateDriveFile();
 
   // Creates a DriveDirectory instance.
   DriveDirectory* CreateDriveDirectory();
 
   // Sets root directory resource id and initialize the root entry.
   void InitializeRootEntry(const std::string& root_id);
 
-  // Add |new entry| to |directory| and invoke the callback asynchronously.
+  // Add |doc entry| to directory with path |directory_path| and invoke the
+  // callback asynchronously.
   // |callback| may not be null.
-  // TODO(achuith,satorux): Use DriveEntryProto instead for new_entry.
-  // crbug.com/142048
-  void AddEntryToDirectory(DriveDirectory* directory,
-                           DriveEntry* new_entry,
+  void AddEntryToDirectory(const FilePath& directory_path,
+                           scoped_ptr<DocumentEntry> doc_entry,
                            const FileMoveCallback& callback);
 
   // Moves |entry| to |directory_path| asynchronously. Removes entry from
   // previous parent. Must be called on UI thread. |callback| is called on the
   // UI thread. |callback| may not be null.
   void MoveEntryToDirectory(const FilePath& directory_path,
                             DriveEntry* entry,
                             const FileMoveCallback& callback);
 
   // Removes entry with |resource_id| from its parent. Calls |callback| with the
@@ skipping 141 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 gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_RESOURCE_METADATA_H_