Upstream version 7.35.139.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 8f573b5..54e4845 100644 (file)
--- a/src/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/src/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -166,11 +166,10 @@ class FileSystemTest : public testing::Test {
       const base::FilePath& file_path) {
     FileError error = FILE_ERROR_FAILED;
     scoped_ptr<ResourceEntryVector> entries(new ResourceEntryVector);
-    bool last_has_more = true;
     file_system_->ReadDirectory(
         file_path,
-        base::Bind(&AccumulateReadDirectoryResult,
-                   &error, entries.get(), &last_has_more));
+        base::Bind(&AccumulateReadDirectoryResult, entries.get()),
+        google_apis::test_util::CreateCopyResultCallback(&error));
     test_util::RunBlockingPoolTask();
     if (error != FILE_ERROR_OK)
       entries.reset();
@@ -179,21 +178,10 @@ class FileSystemTest : public testing::Test {
 
   // 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);
-    }
+      scoped_ptr<ResourceEntryVector> entries) {
+    ASSERT_TRUE(entries);
+    out_entries->insert(out_entries->end(), entries->begin(), entries->end());
   }
 
   // Returns true if an entry exists at |file_path|.