gdata: Add GDataDirectoryService::AddEntryToDirectory()

chrome/browser/chromeos/gdata/gdata_files_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 "chrome/browser/chromeos/gdata/gdata_files.h"
 
 #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 {
 
 namespace {
 
 // See gdata.proto for the difference between the two URLs.
 const char kResumableEditMediaUrl[] = "http://resumable-edit-media/";
 const char kResumableCreateMediaUrl[] = "http://resumable-create-media/";
 
@@ skipping 182 matching lines @@
   ASSERT_TRUE(directory_service.ParseFromString(serialized_proto));
   // No file should be added to the root directory.
   ASSERT_TRUE(root->child_files().empty());
   // Two directories ("empty", "dir") should be added to the root directory.
   ASSERT_EQ(2U, root->child_directories().size());
   // The origin should change to FROM_CACHE because we loaded from the cache.
   ASSERT_EQ(FROM_CACHE, directory_service.origin());
 }
 
 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.
 
   // New value for the entry with resource id "file:file_resource_id".
   GDataFile* new_file_entry = new GDataFile(NULL, &directory_service);
   new_file_entry->set_resource_id("file:file_resource_id");
   directory_service.RefreshFile(scoped_ptr<GDataFile>(new_file_entry).Pass());
   // Root should have |new_file_entry|, not |initial_file_entry|.
   // If this is not true, |new_file_entry| has probably been destroyed, hence
@@ skipping 16 matching lines @@
 TEST(GDataRootDirectoryTest, GetEntryByResourceId_RootDirectory) {
   GDataDirectoryService directory_service;
   // Look up the root directory by its resource ID.
   GDataEntry* entry = directory_service.GetEntryByResourceId(
       kGDataRootDirectoryResourceId);
   ASSERT_TRUE(entry);
   EXPECT_EQ(kGDataRootDirectoryResourceId, entry->resource_id());
 }
 
 }  // namespace gdata