Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/file_system_url_request_job_unittest.cc

 // 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.
 //
 // NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit)
 // rather than as part of test_shell_tests because they rely on being able
 // to instantiate a MessageLoop of type TYPE_IO.  test_shell_tests uses
 // TYPE_UI, which URLRequest doesn't allow.
 //
 
@@ skipping 68 matching lines @@
     // We use the main thread so that we can get the root path synchronously.
     // TODO(adamk): Run this on the FILE thread we've created as well.
     file_system_context_ =
         new FileSystemContext(
             base::MessageLoopProxy::current(),
             base::MessageLoopProxy::current(),
             special_storage_policy_, NULL,
             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();
 
     net::URLRequest::Deprecated::RegisterProtocolFactory(
         "filesystem", &FileSystemURLRequestJobFactory);
   }
 
   virtual void TearDown() {
     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,
                          const net::HttpRequestHeaders* headers,
                          bool run_to_completion) {
     delegate_.reset(new TestDelegate());
     // Make delegate_ exit the MessageLoop when the request is done.
     delegate_->set_quit_on_complete(true);
     delegate_->set_quit_on_redirect(true);
     request_.reset(new net::URLRequest(url, delegate_.get()));
@@ skipping 74 matching lines @@
     DCHECK(job_);
     net::URLRequestJob* temp = job_;
     job_ = NULL;
     return temp;
   }
 
   // Put the message loop at the top, so that it's the last thing deleted.
   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_;
 
   // NOTE: order matters, request must die before delegate
   scoped_ptr<TestDelegate> delegate_;
   scoped_ptr<net::URLRequest> request_;
 
   static net::URLRequestJob* job_;
 };
@@ skipping 144 matching lines @@
 
   TestRequest(CreateFileSystemURL(kFilename));
 
   std::string mime_type_from_job;
   request_->GetMimeType(&mime_type_from_job);
   EXPECT_EQ(mime_type_direct, mime_type_from_job);
 }
 
 }  // namespace (anonymous)
 }  // namespace fileapi