AddEntryToDirectory now takes a FilePath and scoped_ptr<DocumentEntry>

chrome/browser/chromeos/gdata/drive_file_system_unittest.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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 287 matching lines @@
     scoped_ptr<DocumentFeed> document_feed(
         DocumentFeed::ExtractAndParse(*document));
     ASSERT_TRUE(document_feed.get());
     std::vector<DocumentFeed*> feed_list;
     feed_list.push_back(document_feed.get());
     ASSERT_TRUE(UpdateContent(feed_list, largest_changestamp));
   }
 
   void AddDirectoryFromFile(const FilePath& directory_path,
                             const std::string& filename) {
-    std::string error;
     scoped_ptr<Value> atom(LoadJSONFile(filename));
     ASSERT_TRUE(atom.get());
     ASSERT_TRUE(atom->GetType() == Value::TYPE_DICTIONARY);
 
     DictionaryValue* dict_value = NULL;
     Value* entry_value = NULL;
     ASSERT_TRUE(atom->GetAsDictionary(&dict_value));
     ASSERT_TRUE(dict_value->Get("entry", &entry_value));
 
     DictionaryValue* entry_dict = NULL;
     ASSERT_TRUE(entry_value->GetAsDictionary(&entry_dict));
 
     // Tweak entry title to match the last segment of the directory path
     // (new directory name).
     std::vector<FilePath::StringType> dir_parts;
     directory_path.GetComponents(&dir_parts);
     entry_dict->SetString("title.$t", dir_parts[dir_parts.size() - 1]);
 
-    ASSERT_EQ(file_system_->AddNewDirectory(directory_path.DirName(),
-                                            entry_value),
-              DRIVE_FILE_OK)
-        << "Failed adding "
-        << directory_path.DirName().value();
+    DriveFileError error;
+    DriveFileSystem::CreateDirectoryParams params(directory_path,
+                                                  directory_path,
+                                                  false,  // is_exclusive
+                                                  false,  // is_recursive
+        base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+    file_system_->AddNewDirectory(params, HTTP_SUCCESS, atom.Pass());
+    test_util::RunBlockingPoolTask();
+    EXPECT_EQ(DRIVE_FILE_OK, error);
   }
 
   // Updates the content of directory under |directory_path| with parsed feed
   // |value|.
   bool UpdateContent(const std::vector<DocumentFeed*>& list,
                      int largest_changestamp) {
     GURL unused;
     return file_system_->UpdateFromFeedForTesting(
         list,
         largest_changestamp,
@@ skipping 2313 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace gdata