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

chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc

 // Copyright 2013 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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
 #include "chrome/browser/media_galleries/fileapi/iphoto_data_provider.h"
 #include "chrome/browser/media_galleries/fileapi/iphoto_file_util.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_file_system_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/async_file_util.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_operation_runner.h"
+#include "storage/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_operation_runner.h"
 
-using fileapi::FileSystemOperationContext;
-using fileapi::FileSystemOperation;
-using fileapi::FileSystemURL;
+using storage::FileSystemOperationContext;
+using storage::FileSystemOperation;
+using storage::FileSystemURL;
 
 namespace iphoto {
 
 namespace {
 
 void ReadDirectoryTestHelperCallback(
     base::RunLoop* run_loop,
     FileSystemOperation::FileEntryList* contents,
     bool* completed,
     base::File::Error error,
     const FileSystemOperation::FileEntryList& file_list,
     bool has_more) {
   DCHECK(!*completed);
   *completed = !has_more && error == base::File::FILE_OK;
   *contents = file_list;
   run_loop->Quit();
 }
 
-void ReadDirectoryTestHelper(fileapi::FileSystemOperationRunner* runner,
+void ReadDirectoryTestHelper(storage::FileSystemOperationRunner* runner,
                              const FileSystemURL& url,
                              FileSystemOperation::FileEntryList* contents,
                              bool* completed) {
   DCHECK(contents);
   DCHECK(completed);
   base::RunLoop run_loop;
   runner->ReadDirectory(
       url, base::Bind(&ReadDirectoryTestHelperCallback, &run_loop, contents,
                       completed));
   run_loop.Run();
@@ skipping 74 matching lines @@
 
 class TestMediaFileSystemBackend : public MediaFileSystemBackend {
  public:
   TestMediaFileSystemBackend(const base::FilePath& profile_path,
                              IPhotoFileUtil* iphoto_file_util)
       : MediaFileSystemBackend(
             profile_path,
             MediaFileSystemBackend::MediaTaskRunner().get()),
         test_file_util_(iphoto_file_util) {}
 
-  virtual fileapi::AsyncFileUtil*
-  GetAsyncFileUtil(fileapi::FileSystemType type) OVERRIDE {
-    if (type != fileapi::kFileSystemTypeIphoto)
+  virtual storage::AsyncFileUtil* GetAsyncFileUtil(
+      storage::FileSystemType type) OVERRIDE {
+    if (type != storage::kFileSystemTypeIphoto)
       return NULL;
 
     return test_file_util_.get();
   }
 
  private:
-  scoped_ptr<fileapi::AsyncFileUtil> test_file_util_;
+  scoped_ptr<storage::AsyncFileUtil> test_file_util_;
 };
 
 class IPhotoFileUtilTest : public testing::Test {
  public:
   IPhotoFileUtilTest()
       : io_thread_(content::BrowserThread::IO, &message_loop_) {
   }
   virtual ~IPhotoFileUtilTest() {}
 
   void SetUpDataProvider() {
@@ skipping 27 matching lines @@
         FROM_HERE,
         base::Bind(&IPhotoFileUtilTest::SetUpDataProvider,
                    base::Unretained(this)));
     base::WaitableEvent event(true, false /* initially_signalled */);
     MediaFileSystemBackend::MediaTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)));
     event.Wait();
 
     media_path_filter_.reset(new MediaPathFilter());
-    ScopedVector<fileapi::FileSystemBackend> additional_providers;
+    ScopedVector<storage::FileSystemBackend> additional_providers;
     additional_providers.push_back(new TestMediaFileSystemBackend(
         profile_dir_.path(),
         new TestIPhotoFileUtil(media_path_filter_.get(),
                                iphoto_data_provider_.get())));
 
-    file_system_context_ = new fileapi::FileSystemContext(
+    file_system_context_ = new storage::FileSystemContext(
         base::MessageLoopProxy::current().get(),
         base::MessageLoopProxy::current().get(),
-        fileapi::ExternalMountPoints::CreateRefCounted().get(),
+        storage::ExternalMountPoints::CreateRefCounted().get(),
         storage_policy.get(),
         NULL,
         additional_providers.Pass(),
-        std::vector<fileapi::URLRequestAutoMountHandler>(),
+        std::vector<storage::URLRequestAutoMountHandler>(),
         profile_dir_.path(),
         content::CreateAllowFileAccessOptions());
   }
 
  protected:
   void TestNonexistentFolder(const std::string& path_append) {
     FileSystemOperation::FileEntryList contents;
     FileSystemURL url = CreateURL(path_append);
     bool completed = false;
     ReadDirectoryTestHelper(operation_runner(), url, &contents, &completed);
 
     ASSERT_FALSE(completed);
   }
 
   FileSystemURL CreateURL(const std::string& path) const {
     base::FilePath virtual_path =
         ImportedMediaGalleryRegistry::GetInstance()->ImportedRoot();
     virtual_path = virtual_path.AppendASCII("iphoto");
     virtual_path = virtual_path.AppendASCII(path);
     return file_system_context_->CreateCrackedFileSystemURL(
-        GURL("http://www.example.com"), fileapi::kFileSystemTypeIphoto,
+        GURL("http://www.example.com"),
+        storage::kFileSystemTypeIphoto,
         virtual_path);
   }
 
-  fileapi::FileSystemOperationRunner* operation_runner() const {
+  storage::FileSystemOperationRunner* operation_runner() const {
     return file_system_context_->operation_runner();
   }
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context() const {
+  scoped_refptr<storage::FileSystemContext> file_system_context() const {
     return file_system_context_;
   }
 
   TestIPhotoDataProvider* data_provider() const {
     return iphoto_data_provider_.get();
   }
 
  private:
   base::MessageLoop message_loop_;
   content::TestBrowserThread io_thread_;
 
   base::ScopedTempDir profile_dir_;
   base::ScopedTempDir fake_library_dir_;
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+  scoped_refptr<storage::FileSystemContext> file_system_context_;
   scoped_ptr<MediaPathFilter> media_path_filter_;
   scoped_ptr<TestIPhotoDataProvider> iphoto_data_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(IPhotoFileUtilTest);
 };
 
 TEST_F(IPhotoFileUtilTest, RootContents) {
   FileSystemOperation::FileEntryList contents;
   FileSystemURL url = CreateURL("");
   bool completed = false;
@@ skipping 70 matching lines @@
   completed = false;
   ReadDirectoryTestHelper(operation_runner(), url, &contents, &completed);
   ASSERT_TRUE(completed);
   ASSERT_EQ(1u, contents.size());
 
   EXPECT_FALSE(contents.front().is_directory);
   EXPECT_EQ("a.jpg", contents.front().name);
 }
 
 }  // namespace iphoto