AddEntryToDirectory now takes a FilePath and scoped_ptr<DocumentEntry>

chrome/browser/chromeos/gdata/drive_resource_metadata.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
 
 #include <leveldb/db.h>
 #include <utility>
 
 #include "base/message_loop_proxy.h"
@@ skipping 10 matching lines @@
 
 namespace gdata {
 namespace {
 
 // m: prefix for filesystem metadata db keys, version and largest_changestamp.
 // r: prefix for resource id db keys.
 const char kDBKeyLargestChangestamp[] = "m:largest_changestamp";
 const char kDBKeyVersion[] = "m:version";
 const char kDBKeyResourceIdPrefix[] = "r:";
 
+// Posts |error| to |callback| asynchronously.
+void PostError(const FileMoveCallback& callback, DriveFileError error) {
+  base::MessageLoopProxy::current()->PostTask(FROM_HERE,
+      base::Bind(callback, error, FilePath()));
+}
+
 }  // namespace
 
 EntryInfoResult::EntryInfoResult() : error(DRIVE_FILE_ERROR_FAILED) {
 }
 
 EntryInfoResult::~EntryInfoResult() {
 }
 
 EntryInfoPairResult::EntryInfoPairResult() {
 }
@@ skipping 172 matching lines @@
   // Note that children have a reference to root_,
   // so we need to delete them here.
   root_->RemoveChildren();
   RemoveEntryFromResourceMap(root_->resource_id());
   DCHECK(resource_map_.empty());
   resource_map_.clear();
   root_.reset();
 }
 
 void DriveResourceMetadata::AddEntryToDirectory(
-    DriveDirectory* directory,
-    DriveEntry* new_entry,
+    const FilePath& directory_path,
+    scoped_ptr<DocumentEntry> doc_entry,
     const FileMoveCallback& callback) {
-  DCHECK(directory);
-  DCHECK(new_entry);
+  DCHECK(!directory_path.empty());
   DCHECK(!callback.is_null());
 
+  if (!doc_entry.get()) {
+    PostError(callback, DRIVE_FILE_ERROR_FAILED);
+    return;
+  }
+
+  DriveEntry* new_entry = FromDocumentEntry(*doc_entry);
+  if (!new_entry) {
+    PostError(callback, DRIVE_FILE_ERROR_FAILED);
+    return;
+  }
+
+  DriveEntry* dir_entry = FindEntryByPathSync(directory_path);
+  if (!dir_entry) {
+    PostError(callback, DRIVE_FILE_ERROR_NOT_FOUND);
+    return;
+  }
+
+  DriveDirectory* directory = dir_entry->AsDriveDirectory();
+  if (!directory) {
+    PostError(callback, DRIVE_FILE_ERROR_NOT_A_DIRECTORY);
+    return;
+  }
+
   directory->AddEntry(new_entry);
   DVLOG(1) << "AddEntryToDirectory " << new_entry->GetFilePath().value();
   base::MessageLoopProxy::current()->PostTask(FROM_HERE,
       base::Bind(callback, DRIVE_FILE_OK, new_entry->GetFilePath()));
 }
 
 void DriveResourceMetadata::MoveEntryToDirectory(
     const FilePath& directory_path,
     DriveEntry* entry,
     const FileMoveCallback& callback) {
@@ skipping 536 matching lines @@
   DCHECK(result.get());
 
   result->second.path = second_path;
   result->second.error = error;
   result->second.proto = entry_proto.Pass();
 
   callback.Run(result.Pass());
 }
 
 }  // namespace gdata