Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / file_system_unittest.cc

diff --git a/src/chrome/browser/chromeos/drive/file_system_unittest.cc b/src/chrome/browser/chromeos/drive/file_system_unittest.cc
index b642092..49380ff 100644 (file)
--- a/src/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/src/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
+#include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
@@ -80,6 +81,7 @@ class FileSystemTest : public testing::Test {
     pref_service_.reset(new TestingPrefServiceSimple);
     test_util::RegisterDrivePrefs(pref_service_->registry());
 
+    logger_.reset(new EventLogger);
     fake_drive_service_.reset(new FakeDriveService);
     fake_drive_service_->LoadResourceListForWapi(
         "gdata/root_feed.json");
@@ -89,6 +91,7 @@ class FileSystemTest : public testing::Test {
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
     scheduler_.reset(new JobScheduler(pref_service_.get(),
+                                      logger_.get(),
                                       fake_drive_service_.get(),
                                       base::MessageLoopProxy::current().get()));
 
@@ -121,6 +124,7 @@ class FileSystemTest : public testing::Test {
     ASSERT_TRUE(base::CreateDirectory(temp_file_dir));
     file_system_.reset(new FileSystem(
         pref_service_.get(),
+        logger_.get(),
         cache_.get(),
         fake_drive_service_.get(),
         scheduler_.get(),
@@ -160,15 +164,37 @@ class FileSystemTest : public testing::Test {
   scoped_ptr<ResourceEntryVector> ReadDirectorySync(
       const base::FilePath& file_path) {
     FileError error = FILE_ERROR_FAILED;
-    scoped_ptr<ResourceEntryVector> entries;
+    scoped_ptr<ResourceEntryVector> entries(new ResourceEntryVector);
+    bool last_has_more = true;
     file_system_->ReadDirectory(
         file_path,
-        google_apis::test_util::CreateCopyResultCallback(&error, &entries));
+        base::Bind(&AccumulateReadDirectoryResult,
+                   &error, entries.get(), &last_has_more));
     test_util::RunBlockingPoolTask();
-
+    if (error != FILE_ERROR_OK)
+      entries.reset();
     return entries.Pass();
   }
 
+  // Used to implement ReadDirectorySync().
+  static void AccumulateReadDirectoryResult(
+      FileError* out_error,
+      ResourceEntryVector* out_entries,
+      bool* last_has_more,
+      FileError error,
+      scoped_ptr<ResourceEntryVector> entries,
+      bool has_more) {
+    EXPECT_TRUE(*last_has_more);
+    *out_error = error;
+    *last_has_more = has_more;
+    if (error == FILE_ERROR_OK) {
+      ASSERT_TRUE(entries);
+      out_entries->insert(out_entries->end(), entries->begin(), entries->end());
+    } else {
+      EXPECT_FALSE(has_more);
+    }
+  }
+
   // Returns true if an entry exists at |file_path|.
   bool EntryExists(const base::FilePath& file_path) {
     return GetResourceEntrySync(file_path);
@@ -273,6 +299,7 @@ class FileSystemTest : public testing::Test {
   // dependencies to Profile in general.
   scoped_ptr<TestingPrefServiceSimple> pref_service_;
 
+  scoped_ptr<EventLogger> logger_;
   scoped_ptr<FakeDriveService> fake_drive_service_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
   scoped_ptr<JobScheduler> scheduler_;