Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc

 // Copyright 2014 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/file_system_provider/operations/read_directory.h"
 
 #include <string>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/file_system_provider/operations/test_util.h"
 #include "chrome/common/extensions/api/file_system_provider.h"
 #include "chrome/common/extensions/api/file_system_provider_internal.h"
 #include "extensions/browser/event_router.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/async_file_util.h"
 
 namespace chromeos {
 namespace file_system_provider {
 namespace operations {
 namespace {
 
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
 const char kFileSystemId[] = "testing-file-system";
 const int kRequestId = 2;
 const base::FilePath::CharType kDirectoryPath[] = "/directory";
 
 // Callback invocation logger. Acts as a fileapi end-point.
 class CallbackLogger {
  public:
   class Event {
    public:
     Event(base::File::Error result,
-          const fileapi::AsyncFileUtil::EntryList& entry_list,
+          const storage::AsyncFileUtil::EntryList& entry_list,
           bool has_more)
         : result_(result), entry_list_(entry_list), has_more_(has_more) {}
     virtual ~Event() {}
 
     base::File::Error result() { return result_; }
-    const fileapi::AsyncFileUtil::EntryList& entry_list() {
+    const storage::AsyncFileUtil::EntryList& entry_list() {
       return entry_list_;
     }
     bool has_more() { return has_more_; }
 
    private:
     base::File::Error result_;
-    fileapi::AsyncFileUtil::EntryList entry_list_;
+    storage::AsyncFileUtil::EntryList entry_list_;
     bool has_more_;
 
     DISALLOW_COPY_AND_ASSIGN(Event);
   };
 
   CallbackLogger() {}
   virtual ~CallbackLogger() {}
 
   void OnReadDirectory(base::File::Error result,
-                       const fileapi::AsyncFileUtil::EntryList& entry_list,
+                       const storage::AsyncFileUtil::EntryList& entry_list,
                        bool has_more) {
     events_.push_back(new Event(result, entry_list, has_more));
   }
 
   ScopedVector<Event>& events() { return events_; }
 
  private:
   ScopedVector<Event> events_;
   bool dispatch_reply_;
 
@@ skipping 128 matching lines @@
   ASSERT_TRUE(request_value.get());
 
   const bool has_more = false;
   read_directory.OnSuccess(kRequestId, request_value.Pass(), has_more);
 
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_OK, event->result());
 
   ASSERT_EQ(1u, event->entry_list().size());
-  const fileapi::DirectoryEntry entry = event->entry_list()[0];
+  const storage::DirectoryEntry entry = event->entry_list()[0];
   EXPECT_FALSE(entry.is_directory);
   EXPECT_EQ("blueberries.txt", entry.name);
   EXPECT_EQ(4096, entry.size);
   base::Time expected_time;
   EXPECT_TRUE(
       base::Time::FromString("Thu Apr 24 00:46:52 UTC 2014", &expected_time));
   EXPECT_EQ(expected_time, entry.last_modified_time);
 }
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, OnError) {
@@ skipping 17 matching lines @@
 
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result());
   ASSERT_EQ(0u, event->entry_list().size());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos