diff options
Diffstat (limited to 'webkit/fileapi')
17 files changed, 15 insertions, 499 deletions
diff --git a/webkit/fileapi/async_file_test_helper.cc b/webkit/fileapi/async_file_test_helper.cc index 4aaf87a..0870370 100644 --- a/webkit/fileapi/async_file_test_helper.cc +++ b/webkit/fileapi/async_file_test_helper.cc @@ -5,9 +5,9 @@ #include "base/bind.h" #include "base/run_loop.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/quota/quota_manager.h" diff --git a/webkit/fileapi/copy_or_move_file_validator_unittest.cc b/webkit/fileapi/copy_or_move_file_validator_unittest.cc index a8e8315..b334136 100644 --- a/webkit/fileapi/copy_or_move_file_validator_unittest.cc +++ b/webkit/fileapi/copy_or_move_file_validator_unittest.cc @@ -8,11 +8,11 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/copy_or_move_file_validator.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/isolated_context.h" diff --git a/webkit/fileapi/file_system_context_unittest.cc b/webkit/fileapi/file_system_context_unittest.cc index 407bf83..06a638f 100644 --- a/webkit/fileapi/file_system_context_unittest.cc +++ b/webkit/fileapi/file_system_context_unittest.cc @@ -8,8 +8,8 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/isolated_context.h" #include "webkit/fileapi/mock_file_system_options.h" diff --git a/webkit/fileapi/file_system_mount_point_provider.h b/webkit/fileapi/file_system_mount_point_provider.h deleted file mode 100644 index 35ca09c..0000000 --- a/webkit/fileapi/file_system_mount_point_provider.h +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ -#define WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ - -#include <string> -#include <vector> - -#include "base/callback_forward.h" -#include "base/files/file_path.h" -#include "base/memory/scoped_ptr.h" -#include "base/platform_file.h" -#include "webkit/fileapi/file_permission_policy.h" -#include "webkit/fileapi/file_system_types.h" -#include "webkit/storage/webkit_storage_export.h" - -namespace webkit_blob { -class FileStreamReader; -} - -namespace fileapi { - -class AsyncFileUtil; -class CopyOrMoveFileValidatorFactory; -class FileSystemURL; -class FileStreamWriter; -class FileSystemContext; -class FileSystemFileUtil; -class FileSystemOperation; -class FileSystemQuotaUtil; -class RemoteFileSystemProxyInterface; - -// An interface to provide mount-point-specific path-related utilities -// and specialized FileSystemFileUtil instance. -// -// NOTE: when you implement a new MountPointProvider for your own -// FileSystem module, please contact to kinuko@chromium.org. -// -class WEBKIT_STORAGE_EXPORT FileSystemMountPointProvider { - public: - // Callback for ValidateFileSystemRoot. - typedef base::Callback<void(base::PlatformFileError error)> - ValidateFileSystemCallback; - typedef base::Callback<void(base::PlatformFileError error)> - DeleteFileSystemCallback; - virtual ~FileSystemMountPointProvider() {} - - // Returns true if this mount point provider can handle |type|. - // One mount point provider may be able to handle multiple filesystem types. - virtual bool CanHandleType(FileSystemType type) const = 0; - - // Validates the filesystem for the given |origin_url| and |type|. - // This verifies if it is allowed to request (or create) the filesystem - // and if it can access (or create) the root directory of the mount point. - // If |create| is true this may also create the root directory for - // the filesystem if it doesn't exist. - virtual void ValidateFileSystemRoot( - const GURL& origin_url, - FileSystemType type, - bool create, - const ValidateFileSystemCallback& callback) = 0; - - // Retrieves the root path of the filesystem specified by the given - // file system url on the file thread. - // If |create| is true this may also create the root directory for - // the filesystem if it doesn't exist. - virtual base::FilePath GetFileSystemRootPathOnFileThread( - const FileSystemURL& url, - bool create) = 0; - - // Returns the specialized FileSystemFileUtil for this mount point. - // It is ok to return NULL if the filesystem doesn't support synchronous - // version of FileUtil. - virtual FileSystemFileUtil* GetFileUtil(FileSystemType type) = 0; - - // Returns the specialized AsyncFileUtil for this mount point. - virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) = 0; - - // Returns the specialized CopyOrMoveFileValidatorFactory for this mount - // point and |type|. If |error_code| is PLATFORM_FILE_OK and the result - // is NULL, then no validator is required. - virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory( - FileSystemType type, base::PlatformFileError* error_code) = 0; - - // Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than - // once. - virtual void InitializeCopyOrMoveFileValidatorFactory( - FileSystemType type, - scoped_ptr<CopyOrMoveFileValidatorFactory> factory) = 0; - - // Returns file permission policy we should apply for the given |url|. - virtual FilePermissionPolicy GetPermissionPolicy( - const FileSystemURL& url, - int permissions) const = 0; - - // Returns a new instance of the specialized FileSystemOperation for this - // mount point based on the given triplet of |origin_url|, |file_system_type| - // and |virtual_path|. On failure to create a file system operation, set - // |error_code| correspondingly. - // This method is usually dispatched by - // FileSystemContext::CreateFileSystemOperation. - virtual FileSystemOperation* CreateFileSystemOperation( - const FileSystemURL& url, - FileSystemContext* context, - base::PlatformFileError* error_code) const = 0; - - // Creates a new file stream reader for a given filesystem URL |url| with an - // offset |offset|. |expected_modification_time| specifies the expected last - // modification if the value is non-null, the reader will check the underlying - // file's actual modification time to see if the file has been modified, and - // if it does any succeeding read operations should fail with - // ERR_UPLOAD_FILE_CHANGED error. - // This method itself does *not* check if the given path exists and is a - // regular file. - virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader( - const FileSystemURL& url, - int64 offset, - const base::Time& expected_modification_time, - FileSystemContext* context) const = 0; - - // Creates a new file stream writer for a given filesystem URL |url| with an - // offset |offset|. - // This method itself does *not* check if the given path exists and is a - // regular file. - virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter( - const FileSystemURL& url, - int64 offset, - FileSystemContext* context) const = 0; - - // Returns the specialized FileSystemQuotaUtil for this mount point. - // This could return NULL if this mount point does not support quota. - virtual FileSystemQuotaUtil* GetQuotaUtil() = 0; - - // Deletes the filesystem for the given |origin_url| and |type|. - virtual void DeleteFileSystem( - const GURL& origin_url, - FileSystemType type, - FileSystemContext* context, - const DeleteFileSystemCallback& callback) = 0; -}; - -// An interface to control external file system access permissions. -class ExternalFileSystemMountPointProvider - : public FileSystemMountPointProvider { - public: - // Returns true if |url| is allowed to be accessed. - // This is supposed to perform ExternalFileSystem-specific security - // checks. This method is also likely to be called by - // FileSystemMountPointProvider::GetPermissionPolicy as - // GetPermissionPolicy is supposed to perform fileapi-generic security - // checks (which likely need to include ExternalFileSystem-specific checks). - virtual bool IsAccessAllowed(const fileapi::FileSystemURL& url) const = 0; - // Returns the list of top level directories that are exposed by this - // provider. This list is used to set appropriate child process file access - // permissions. - virtual std::vector<base::FilePath> GetRootDirectories() const = 0; - // Grants access to all external file system from extension identified with - // |extension_id|. - virtual void GrantFullAccessToExtension(const std::string& extension_id) = 0; - // Grants access to |virtual_path| from |origin_url|. - virtual void GrantFileAccessToExtension( - const std::string& extension_id, - const base::FilePath& virtual_path) = 0; - // Revokes file access from extension identified with |extension_id|. - virtual void RevokeAccessForExtension( - const std::string& extension_id) = 0; - // Gets virtual path by known filesystem path. Returns false when filesystem - // path is not exposed by this provider. - virtual bool GetVirtualPath(const base::FilePath& file_system_path, - base::FilePath* virtual_path) = 0; -}; - -} // namespace fileapi - -#endif // WEBKIT_FILEAPI_FILE_SYSTEM_MOUNT_POINT_PROVIDER_H_ diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc deleted file mode 100644 index 516cdb4..0000000 --- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc +++ /dev/null @@ -1,307 +0,0 @@ -// Copyright (c) 2012 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 <set> -#include <string> - -#include "base/basictypes.h" -#include "base/bind.h" -#include "base/file_util.h" -#include "base/files/scoped_temp_dir.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "base/memory/weak_ptr.h" -#include "base/message_loop.h" -#include "base/message_loop_proxy.h" -#include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" -#include "googleurl/src/gurl.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "webkit/fileapi/external_mount_points.h" -#include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_task_runners.h" -#include "webkit/fileapi/file_system_url.h" -#include "webkit/fileapi/file_system_util.h" -#include "webkit/fileapi/mock_file_system_options.h" -#include "webkit/fileapi/sandbox_mount_point_provider.h" -#include "webkit/quota/mock_special_storage_policy.h" - -#if defined(OS_CHROMEOS) -#include "webkit/chromeos/fileapi/cros_mount_point_provider.h" -#endif - -namespace fileapi { - -namespace { - -// PS stands for path separator. -#if defined(FILE_PATH_USES_WIN_SEPARATORS) -#define PS "\\" -#else -#define PS "/" -#endif - -struct RootPathTestCase { - fileapi::FileSystemType type; - const char* origin_url; - const char* expected_path; -}; - -const struct RootPathTest { - fileapi::FileSystemType type; - const char* origin_url; - const char* expected_path; -} kRootPathTestCases[] = { - { fileapi::kFileSystemTypeTemporary, "http://foo:1/", - "000" PS "t" }, - { fileapi::kFileSystemTypePersistent, "http://foo:1/", - "000" PS "p" }, - { fileapi::kFileSystemTypeTemporary, "http://bar.com/", - "001" PS "t" }, - { fileapi::kFileSystemTypePersistent, "http://bar.com/", - "001" PS "p" }, - { fileapi::kFileSystemTypeTemporary, "https://foo:2/", - "002" PS "t" }, - { fileapi::kFileSystemTypePersistent, "https://foo:2/", - "002" PS "p" }, - { fileapi::kFileSystemTypeTemporary, "https://bar.com/", - "003" PS "t" }, - { fileapi::kFileSystemTypePersistent, "https://bar.com/", - "003" PS "p" }, -#if defined(OS_CHROMEOS) - { fileapi::kFileSystemTypeExternal, "chrome-extension://foo/", - "chrome-extension__0" /* unused, only for logging */ }, -#endif -}; - -const struct RootPathFileURITest { - fileapi::FileSystemType type; - const char* origin_url; - const char* expected_path; - const char* virtual_path; -} kRootPathFileURITestCases[] = { - { fileapi::kFileSystemTypeTemporary, "file:///", - "000" PS "t", NULL }, - { fileapi::kFileSystemTypePersistent, "file:///", - "000" PS "p", NULL }, -}; - -const struct CheckValidPathTest { - base::FilePath::StringType path; - bool expected_valid; -} kCheckValidPathTestCases[] = { - { FILE_PATH_LITERAL("//tmp/foo.txt"), false, }, - { FILE_PATH_LITERAL("//etc/hosts"), false, }, - { FILE_PATH_LITERAL("foo.txt"), true, }, - { FILE_PATH_LITERAL("a/b/c"), true, }, - // Any paths that includes parent references are considered invalid. - { FILE_PATH_LITERAL(".."), false, }, - { FILE_PATH_LITERAL("tmp/.."), false, }, - { FILE_PATH_LITERAL("a/b/../c/.."), false, }, -}; - -// For External filesystem. -const base::FilePath::CharType kMountPoint[] = FILE_PATH_LITERAL("/tmp/testing"); -const base::FilePath::CharType kRootPath[] = FILE_PATH_LITERAL("/tmp"); -const base::FilePath::CharType kVirtualPath[] = FILE_PATH_LITERAL("testing"); - -} // namespace - -class FileSystemMountPointProviderTest : public testing::Test { - public: - FileSystemMountPointProviderTest() - : weak_factory_(this) { - } - - virtual void SetUp() { - ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); - special_storage_policy_ = new quota::MockSpecialStoragePolicy; - } - - protected: - void SetupNewContext(const FileSystemOptions& options) { - scoped_refptr<ExternalMountPoints> external_mount_points( - ExternalMountPoints::CreateRefCounted()); - file_system_context_ = new FileSystemContext( - FileSystemTaskRunners::CreateMockTaskRunners(), - external_mount_points.get(), - special_storage_policy_, - NULL, - ScopedVector<FileSystemMountPointProvider>(), - data_dir_.path(), - options); -#if defined(OS_CHROMEOS) - base::FilePath mount_point_path = base::FilePath(kMountPoint); - external_mount_points->RegisterFileSystem( - mount_point_path.BaseName().AsUTF8Unsafe(), - kFileSystemTypeNativeLocal, - mount_point_path); -#endif - } - - FileSystemMountPointProvider* provider(FileSystemType type) { - DCHECK(file_system_context_); - return file_system_context_->GetMountPointProvider(type); - } - - bool GetRootPath(const GURL& origin_url, - fileapi::FileSystemType type, - bool create, - base::FilePath* root_path) { - base::FilePath virtual_path = base::FilePath(); - if (type == kFileSystemTypeExternal) - virtual_path = base::FilePath(kVirtualPath); - FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( - origin_url, type, virtual_path); - base::FilePath returned_root_path = - provider(type)->GetFileSystemRootPathOnFileThread(url, create); - if (root_path) - *root_path = returned_root_path; - return !returned_root_path.empty(); - } - - base::FilePath data_path() const { return data_dir_.path(); } - base::FilePath file_system_path() const { - return data_dir_.path().Append( - SandboxMountPointProvider::kFileSystemDirectory); - } - FileSystemContext* file_system_context() const { - return file_system_context_.get(); - } - - private: - base::ScopedTempDir data_dir_; - base::MessageLoop message_loop_; - base::WeakPtrFactory<FileSystemMountPointProviderTest> weak_factory_; - - scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_; - scoped_refptr<FileSystemContext> file_system_context_; - - DISALLOW_COPY_AND_ASSIGN(FileSystemMountPointProviderTest); -}; - -TEST_F(FileSystemMountPointProviderTest, GetRootPathCreateAndExamine) { - std::vector<base::FilePath> returned_root_path( - ARRAYSIZE_UNSAFE(kRootPathTestCases)); - SetupNewContext(CreateAllowFileAccessOptions()); - - // Create a new root directory. - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) { - SCOPED_TRACE(testing::Message() << "RootPath (create) #" << i << " " - << kRootPathTestCases[i].expected_path); - - base::FilePath root_path; - EXPECT_TRUE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), - kRootPathTestCases[i].type, - true /* create */, &root_path)); - - if (kRootPathTestCases[i].type != kFileSystemTypeExternal) { - base::FilePath expected = file_system_path().AppendASCII( - kRootPathTestCases[i].expected_path); - EXPECT_EQ(expected.value(), root_path.value()); - EXPECT_TRUE(file_util::DirectoryExists(root_path)); - } else { - // External file system root path is virtual one and does not match - // anything from the actual file system. - EXPECT_EQ(kRootPath, root_path.value()); - } - ASSERT_TRUE(returned_root_path.size() > i); - returned_root_path[i] = root_path; - } - - // Get the root directory with create=false and see if we get the - // same directory. - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) { - SCOPED_TRACE(testing::Message() << "RootPath (get) #" << i << " " - << kRootPathTestCases[i].expected_path); - - base::FilePath root_path; - EXPECT_TRUE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), - kRootPathTestCases[i].type, - false /* create */, &root_path)); - ASSERT_TRUE(returned_root_path.size() > i); - EXPECT_EQ(returned_root_path[i].value(), root_path.value()); - } -} - -TEST_F(FileSystemMountPointProviderTest, - GetRootPathCreateAndExamineWithNewProvider) { - std::vector<base::FilePath> returned_root_path( - ARRAYSIZE_UNSAFE(kRootPathTestCases)); - SetupNewContext(CreateAllowFileAccessOptions()); - - GURL origin_url("http://foo.com:1/"); - - base::FilePath root_path1; - EXPECT_TRUE(GetRootPath(origin_url, - kFileSystemTypeTemporary, true, &root_path1)); - - SetupNewContext(CreateDisallowFileAccessOptions()); - base::FilePath root_path2; - EXPECT_TRUE(GetRootPath(origin_url, - kFileSystemTypeTemporary, false, &root_path2)); - - EXPECT_EQ(root_path1.value(), root_path2.value()); -} - -TEST_F(FileSystemMountPointProviderTest, GetRootPathGetWithoutCreate) { - SetupNewContext(CreateDisallowFileAccessOptions()); - - // Try to get a root directory without creating. - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) { - SCOPED_TRACE(testing::Message() << "RootPath (create=false) #" << i << " " - << kRootPathTestCases[i].expected_path); - // External type does not check the directory existence. - if (kRootPathTestCases[i].type != kFileSystemTypeExternal) { - EXPECT_FALSE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), - kRootPathTestCases[i].type, - false /* create */, NULL)); - } - } -} - -TEST_F(FileSystemMountPointProviderTest, GetRootPathInIncognito) { - SetupNewContext(CreateIncognitoFileSystemOptions()); - - // Try to get a root directory. - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathTestCases); ++i) { - SCOPED_TRACE(testing::Message() << "RootPath (incognito) #" << i << " " - << kRootPathTestCases[i].expected_path); - // External type does not change the behavior in incognito mode. - if (kRootPathTestCases[i].type != kFileSystemTypeExternal) { - EXPECT_FALSE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), - kRootPathTestCases[i].type, - true /* create */, NULL)); - } - } -} - -TEST_F(FileSystemMountPointProviderTest, GetRootPathFileURI) { - SetupNewContext(CreateDisallowFileAccessOptions()); - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathFileURITestCases); ++i) { - SCOPED_TRACE(testing::Message() << "RootPathFileURI (disallow) #" - << i << " " << kRootPathFileURITestCases[i].expected_path); - EXPECT_FALSE(GetRootPath(GURL(kRootPathFileURITestCases[i].origin_url), - kRootPathFileURITestCases[i].type, - true /* create */, NULL)); - } -} - -TEST_F(FileSystemMountPointProviderTest, GetRootPathFileURIWithAllowFlag) { - SetupNewContext(CreateAllowFileAccessOptions()); - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRootPathFileURITestCases); ++i) { - SCOPED_TRACE(testing::Message() << "RootPathFileURI (allow) #" - << i << " " << kRootPathFileURITestCases[i].expected_path); - base::FilePath root_path; - EXPECT_TRUE(GetRootPath(GURL(kRootPathFileURITestCases[i].origin_url), - kRootPathFileURITestCases[i].type, - true /* create */, &root_path)); - base::FilePath expected = file_system_path().AppendASCII( - kRootPathFileURITestCases[i].expected_path); - EXPECT_EQ(expected.value(), root_path.value()); - EXPECT_TRUE(file_util::DirectoryExists(root_path)); - } -} - -} // namespace fileapi diff --git a/webkit/fileapi/isolated_mount_point_provider.h b/webkit/fileapi/isolated_mount_point_provider.h index bc8ce6d..75258d9 100644 --- a/webkit/fileapi/isolated_mount_point_provider.h +++ b/webkit/fileapi/isolated_mount_point_provider.h @@ -6,7 +6,7 @@ #define WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_ #include "base/memory/scoped_ptr.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" namespace fileapi { diff --git a/webkit/fileapi/local_file_system_cross_operation_unittest.cc b/webkit/fileapi/local_file_system_cross_operation_unittest.cc index a4f6887..487a16f 100644 --- a/webkit/fileapi/local_file_system_cross_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_cross_operation_unittest.cc @@ -12,9 +12,9 @@ #include "base/run_loop.h" #include "base/stl_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc index 27fc1f8..80c2769 100644 --- a/webkit/fileapi/local_file_system_operation.cc +++ b/webkit/fileapi/local_file_system_operation.cc @@ -11,12 +11,12 @@ #include "net/base/escape.h" #include "net/url_request/url_request_context.h" #include "webkit/blob/shareable_file_reference.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_util.h" #include "webkit/fileapi/cross_operation_delegate.h" #include "webkit/fileapi/file_observers.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc index f2b6cbb..346d109 100644 --- a/webkit/fileapi/local_file_system_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_unittest.cc @@ -15,10 +15,10 @@ #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/shareable_file_reference.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/file_system_util.h" diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc index d08cc49..7a91b59 100644 --- a/webkit/fileapi/local_file_util.cc +++ b/webkit/fileapi/local_file_util.cc @@ -7,8 +7,8 @@ #include "base/file_util.h" #include "base/files/file_util_proxy.h" #include "googleurl/src/gurl.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_url.h" diff --git a/webkit/fileapi/mock_file_system_context.cc b/webkit/fileapi/mock_file_system_context.cc index 669d431..39f9016 100644 --- a/webkit/fileapi/mock_file_system_context.cc +++ b/webkit/fileapi/mock_file_system_context.cc @@ -5,9 +5,9 @@ #include "webkit/fileapi/mock_file_system_context.h" #include "base/memory/scoped_vector.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/mock_file_system_options.h" #include "webkit/fileapi/test_mount_point_provider.h" diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index cbcc2d8..2c78267 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -14,10 +14,10 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_test_helper.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/file_system_usage_cache.h" diff --git a/webkit/fileapi/sandbox_mount_point_provider.h b/webkit/fileapi/sandbox_mount_point_provider.h index 4920c9b..91d1938 100644 --- a/webkit/fileapi/sandbox_mount_point_provider.h +++ b/webkit/fileapi/sandbox_mount_point_provider.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "googleurl/src/gurl.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_options.h" #include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/task_runner_bound_observer_list.h" diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index 629eece..cca5cda 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -14,7 +14,7 @@ #include "base/message_loop_proxy.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/mock_file_system_options.h" diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.cc b/webkit/fileapi/syncable/canned_syncable_file_system.cc index 32c50c7..1182f26 100644 --- a/webkit/fileapi/syncable/canned_syncable_file_system.cc +++ b/webkit/fileapi/syncable/canned_syncable_file_system.cc @@ -13,9 +13,9 @@ #include "base/task_runner_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/mock_blob_url_request_context.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/external_mount_points.h" #include "webkit/fileapi/file_system_context.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_task_runners.h" #include "webkit/fileapi/local_file_system_operation.h" diff --git a/webkit/fileapi/test_mount_point_provider.h b/webkit/fileapi/test_mount_point_provider.h index 8a71b77..1fcbd7d 100644 --- a/webkit/fileapi/test_mount_point_provider.h +++ b/webkit/fileapi/test_mount_point_provider.h @@ -8,8 +8,8 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/async_file_util_adapter.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/task_runner_bound_observer_list.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc b/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc index ddf78a1..894f1ce 100644 --- a/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc +++ b/webkit/fileapi/upload_file_system_file_element_reader_unittest.cc @@ -9,9 +9,9 @@ #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webkit/browser/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" -#include "webkit/fileapi/file_system_mount_point_provider.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/mock_file_system_context.h" |