gdata: Add GDataDirectoryService::AddEntryToDirectory()

chrome/browser/chromeos/gdata/gdata_files_unittest.cc

Index: chrome/browser/chromeos/gdata/gdata_files_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_files_unittest.cc b/chrome/browser/chromeos/gdata/gdata_files_unittest.cc
index 380d6b8a6cfc185203b29a8a10608eaf222e89c1..3b9c6703dafcc045c33a5dcf837034f6a5a5afad 100644
--- a/chrome/browser/chromeos/gdata/gdata_files_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_files_unittest.cc
@@ -7,7 +7,9 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include "base/message_loop.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
+#include "chrome/browser/chromeos/gdata/gdata_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gdata {
@@ -210,18 +212,35 @@ TEST(GDataRootDirectoryTest, ParseFromString_DetectNoUploadUrl) {
 }
 
 TEST(GDataRootDirectoryTest, RefreshFile) {
+  MessageLoopForUI message_loop;
   GDataDirectoryService directory_service;
   GDataDirectory* root(directory_service.root());
   // Add a directory to the file system.
   GDataDirectory* directory_entry = new GDataDirectory(root,
                                                        &directory_service);
   directory_entry->set_resource_id("folder:directory_resource_id");
-  root->AddEntry(directory_entry);
+  directory_entry->set_title("directory");
+  directory_entry->SetBaseNameFromTitle();
+  GDataFileError error = GDATA_FILE_ERROR_FAILED;
+  directory_service.AddEntryAt(
+      FilePath(kGDataRootDirectory),
+      directory_entry,
+      base::Bind(&test_util::CopyResultFromFileOperationCallback, &error));
+  test_util::RunBlockingPoolTask();
+  ASSERT_EQ(GDATA_FILE_OK, error);
 
   // Add a new file to the directory.
   GDataFile* initial_file_entry = new GDataFile(NULL, &directory_service);
   initial_file_entry->set_resource_id("file:file_resource_id");
-  directory_entry->AddEntry(initial_file_entry);
+  initial_file_entry->set_title("file");
+  initial_file_entry->SetBaseNameFromTitle();
+  directory_service.AddEntryAt(
+      directory_entry->GetFilePath(),
+      initial_file_entry,
+      base::Bind(&test_util::CopyResultFromFileOperationCallback, &error));
+  test_util::RunBlockingPoolTask();
+  ASSERT_EQ(GDATA_FILE_OK, error);
+
   ASSERT_EQ(directory_entry, initial_file_entry->parent());
 
   // Initial file system state set, let's try refreshing entries.