| Index: webkit/fileapi/file_system_url_request_job_unittest.cc
|
| diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc
|
| index 0e96ec3e5b6fc4da133a4b28e920ea15ee4b586b..6a49af7c576cb6d2272a08578d806052a0abe770 100644
|
| --- a/webkit/fileapi/file_system_url_request_job_unittest.cc
|
| +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc
|
| @@ -86,9 +86,9 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| temp_dir_.path(),
|
| CreateDisallowFileAccessOptions());
|
|
|
| - file_system_context_->sandbox_provider()->ValidateFileSystemRootAndGetURL(
|
| + file_system_context_->sandbox_provider()->ValidateFileSystemRoot(
|
| GURL("http://remote/"), kFileSystemTypeTemporary, true, // create
|
| - base::Bind(&FileSystemURLRequestJobTest::OnGetRootPath,
|
| + base::Bind(&FileSystemURLRequestJobTest::OnValidateFileSystem,
|
| weak_factory_.GetWeakPtr()));
|
| MessageLoop::current()->RunAllPending();
|
|
|
| @@ -100,10 +100,8 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| net::URLRequest::Deprecated::RegisterProtocolFactory("filesystem", NULL);
|
| }
|
|
|
| - void OnGetRootPath(bool success, const FilePath& root_path,
|
| - const std::string& name) {
|
| - ASSERT_TRUE(success);
|
| - origin_root_path_ = root_path;
|
| + void OnValidateFileSystem(base::PlatformFileError result) {
|
| + ASSERT_EQ(base::PLATFORM_FILE_OK, result);
|
| }
|
|
|
| void TestRequestHelper(const GURL& url,
|
| @@ -198,7 +196,6 @@ class FileSystemURLRequestJobTest : public testing::Test {
|
| MessageLoop message_loop_;
|
|
|
| ScopedTempDir temp_dir_;
|
| - FilePath origin_root_path_;
|
| scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy_;
|
| scoped_refptr<FileSystemContext> file_system_context_;
|
| base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_;
|
|
|