| Index: content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
|
| diff --git a/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc b/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
|
| index 935f6ce2fe4ee4735ee54702429f926e524bdbdf..f216cac2a3c7c0ed1c415d010506059177408f6e 100644
|
| --- a/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
|
| +++ b/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
|
| +#include "storage/browser/fileapi/sandbox_file_system_backend_delegate.h"
|
|
|
| #include "base/basictypes.h"
|
| #include "base/file_util.h"
|
| @@ -13,9 +13,9 @@
|
| #include "content/public/test/test_file_system_options.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/browser/fileapi/file_system_url.h"
|
| +#include "storage/browser/fileapi/file_system_url.h"
|
|
|
| -using fileapi::FileSystemURL;
|
| +using storage::FileSystemURL;
|
|
|
| namespace content {
|
|
|
| @@ -23,8 +23,9 @@ namespace {
|
|
|
| FileSystemURL CreateFileSystemURL(const char* path) {
|
| const GURL kOrigin("http://foo/");
|
| - return fileapi::FileSystemURL::CreateForTest(
|
| - kOrigin, fileapi::kFileSystemTypeTemporary,
|
| + return storage::FileSystemURL::CreateForTest(
|
| + kOrigin,
|
| + storage::kFileSystemTypeTemporary,
|
| base::FilePath::FromUTF8Unsafe(path));
|
| }
|
|
|
| @@ -34,7 +35,7 @@ class SandboxFileSystemBackendDelegateTest : public testing::Test {
|
| protected:
|
| virtual void SetUp() {
|
| ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
|
| - delegate_.reset(new fileapi::SandboxFileSystemBackendDelegate(
|
| + delegate_.reset(new storage::SandboxFileSystemBackendDelegate(
|
| NULL /* quota_manager_proxy */,
|
| base::MessageLoopProxy::current().get(),
|
| data_dir_.path(),
|
| @@ -48,7 +49,7 @@ class SandboxFileSystemBackendDelegateTest : public testing::Test {
|
|
|
| base::ScopedTempDir data_dir_;
|
| base::MessageLoop message_loop_;
|
| - scoped_ptr<fileapi::SandboxFileSystemBackendDelegate> delegate_;
|
| + scoped_ptr<storage::SandboxFileSystemBackendDelegate> delegate_;
|
| };
|
|
|
| TEST_F(SandboxFileSystemBackendDelegateTest, IsAccessValid) {
|
| @@ -60,9 +61,9 @@ TEST_F(SandboxFileSystemBackendDelegateTest, IsAccessValid) {
|
|
|
| // Access from non-allowed scheme should be disallowed.
|
| EXPECT_FALSE(IsAccessValid(
|
| - FileSystemURL::CreateForTest(
|
| - GURL("unknown://bar"), fileapi::kFileSystemTypeTemporary,
|
| - base::FilePath::FromUTF8Unsafe("foo"))));
|
| + FileSystemURL::CreateForTest(GURL("unknown://bar"),
|
| + storage::kFileSystemTypeTemporary,
|
| + base::FilePath::FromUTF8Unsafe("foo"))));
|
|
|
| // Access with restricted name should be disallowed.
|
| EXPECT_FALSE(IsAccessValid(CreateFileSystemURL(".")));
|
|
|