Picasa import: Make NativeMediaFileUtil an AsyncFileUtil

chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc

Index: chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc
diff --git a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc
index 0ca6a9f46a49c60cc23d24e528dcf0dbd8b74e7f..228c2579f3a82505bb23680bf2bfb29c9a9bb4a8 100644
--- a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <map>
 #include <set>
 #include <string>
 
@@ -20,6 +21,7 @@
 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/async_file_util_adapter.h"
+#include "webkit/browser/fileapi/async_file_util_test_helper.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_file_util.h"
@@ -146,10 +148,9 @@ class TestMediaFileSystemMountPointProvider
  public:
   TestMediaFileSystemMountPointProvider(
       const base::FilePath& profile_path,
-      scoped_ptr<PicasaFileUtil> picasa_file_util)
+      PicasaFileUtil* picasa_file_util)
       : chrome::MediaFileSystemMountPointProvider(profile_path),
-        test_file_util_(new fileapi::AsyncFileUtilAdapter(
-            picasa_file_util.release())) {
+        test_file_util_(picasa_file_util) {
   }
 
   virtual fileapi::AsyncFileUtil*
@@ -186,8 +187,6 @@ class PicasaFileUtilTest : public testing::Test {
 
     scoped_ptr<PicasaDataProvider> data_provider(
         new PicasaDataProvider(test_helper_->GetTempDirPath()));
-    scoped_ptr<PicasaFileUtil> file_util(new TestPicasaFileUtil(
-        data_provider.Pass()));
 
     ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
 
@@ -195,9 +194,9 @@ class PicasaFileUtilTest : public testing::Test {
         new quota::MockSpecialStoragePolicy();
 
     ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers;
-    additional_providers.push_back(
-        new TestMediaFileSystemMountPointProvider(profile_dir_.path(),
-                                                  file_util.Pass()));
+    additional_providers.push_back(new TestMediaFileSystemMountPointProvider(
+        profile_dir_.path(),
+        new TestPicasaFileUtil(data_provider.Pass())));
 
     file_system_context_ = new fileapi::FileSystemContext(
         fileapi::FileSystemTaskRunners::CreateMockTaskRunners(),
@@ -387,19 +386,22 @@ TEST_F(PicasaFileUtilTest, NameDeduplication) {
 
   scoped_ptr<PicasaDataProvider> data_provider(
       new TestPicasaDataProvider(std::vector<AlbumInfo>(), folders));
-  TestPicasaFileUtil file_util(data_provider.Pass());
-
-  scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> file_enumerator =
-      file_util.CreateFileEnumerator(operation_context.get(),
-                                     CreateURL("folders"));
-
-  for (unsigned int i = 0; i < expected_names.size(); ++i) {
-    base::FilePath path = file_enumerator->Next();
-
-    ASSERT_TRUE(!path.empty());
-    EXPECT_EQ(expected_names[i], path.BaseName().AsUTF8Unsafe());
-    EXPECT_EQ(folders[i].timestamp, file_enumerator->LastModifiedTime());
-    EXPECT_TRUE(file_enumerator->IsDirectory());
+  fileapi::AsyncFileUtilTestHelper test_file_util(
+      new TestPicasaFileUtil(data_provider.Pass()));
+
+  fileapi::AsyncFileUtil::EntryList file_list;
+  bool has_more = false;
+  test_file_util.ReadDirectorySync(operation_context.get(),
+                                   CreateURL(kPicasaDirFolders),
+                                   &file_list,
+                                   &has_more);
+
+  for (unsigned int i = 0; i < file_list.size(); ++i) {
+    ASSERT_TRUE(!file_list[i].name.empty());
+    EXPECT_EQ(expected_names[i],
+              base::FilePath(file_list[i].name).AsUTF8Unsafe());
+    EXPECT_EQ(folders[i].timestamp, file_list[i].last_modified_time);
+    EXPECT_TRUE(file_list[i].is_directory);
   }
 }