Replace GDataDirectory::TakeEntry with GDataDirectoryService::AddEntryToDirectory.

chrome/browser/chromeos/gdata/gdata_files_unittest.cc

Index: chrome/browser/chromeos/gdata/gdata_files_unittest.cc
===================================================================
--- chrome/browser/chromeos/gdata/gdata_files_unittest.cc	(revision 150441)
+++ chrome/browser/chromeos/gdata/gdata_files_unittest.cc	(working copy)
@@ -31,7 +31,7 @@
 GDataDirectory* AddDirectory(GDataDirectory* parent,
                              GDataDirectoryService* directory_service,
                              int sequence_id) {
-  GDataDirectory* dir = new GDataDirectory(parent, directory_service);
+  GDataDirectory* dir = new GDataDirectory(NULL, directory_service);
   const std::string dir_name = "dir" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("dir_resource_id:") +
                                   dir_name;
@@ -41,7 +41,7 @@
   directory_service->AddEntryToDirectory(
       parent->GetFilePath(),
       dir,
-      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+      base::Bind(&test_util::CopyErrorCodeFromFilePathUpdateCallback, &error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(GDATA_FILE_OK, error);
   return dir;
@@ -52,7 +52,7 @@
 GDataFile* AddFile(GDataDirectory* parent,
                    GDataDirectoryService* directory_service,
                    int sequence_id) {
-  GDataFile* file = new GDataFile(parent, directory_service);
+  GDataFile* file = new GDataFile(NULL, directory_service);
   const std::string title = "file" + base::IntToString(sequence_id);
   const std::string resource_id = std::string("file_resource_id:") +
                                   title;
@@ -63,7 +63,7 @@
   directory_service->AddEntryToDirectory(
       parent->GetFilePath(),
       file,
-      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+      base::Bind(&test_util::CopyErrorCodeFromFilePathUpdateCallback, &error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(GDATA_FILE_OK, error);
   return file;
@@ -373,10 +373,12 @@
 
 TEST(GDataRootDirectoryTest, RefreshFile) {
   MessageLoopForUI message_loop;
+  content::TestBrowserThread ui_thread(content::BrowserThread::UI,
+                                       &message_loop);
+
   GDataDirectoryService directory_service;
-  GDataDirectory* root(directory_service.root());
   // Add a directory to the file system.
-  GDataDirectory* directory_entry = new GDataDirectory(root,
+  GDataDirectory* directory_entry = new GDataDirectory(NULL,
                                                        &directory_service);
   directory_entry->set_resource_id("folder:directory_resource_id");
   directory_entry->set_title("directory");
@@ -385,7 +387,7 @@
   directory_service.AddEntryToDirectory(
       FilePath(kGDataRootDirectory),
       directory_entry,
-      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+      base::Bind(&test_util::CopyErrorCodeFromFilePathUpdateCallback, &error));
   test_util::RunBlockingPoolTask();
   ASSERT_EQ(GDATA_FILE_OK, error);
 
@@ -394,10 +396,11 @@
   initial_file_entry->set_resource_id("file:file_resource_id");
   initial_file_entry->set_title("file");
   initial_file_entry->SetBaseNameFromTitle();
+  error = GDATA_FILE_ERROR_FAILED;
   directory_service.AddEntryToDirectory(
       directory_entry->GetFilePath(),
       initial_file_entry,
-      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+      base::Bind(&test_util::CopyErrorCodeFromFilePathUpdateCallback, &error));
   test_util::RunBlockingPoolTask();
   ASSERT_EQ(GDATA_FILE_OK, error);