Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/sandbox_mount_point_provider_unittest.cc

 // Copyright (c) 2011 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 "webkit/fileapi/sandbox_mount_point_provider.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 139 matching lines @@
   }
 
   SandboxMountPointProvider* sandbox_provider() {
     return file_system_context_->sandbox_provider();
   }
 
   FileSystemFileUtil* file_util() {
     return sandbox_provider()->GetFileUtil();
   }
 
-  void OnGetRootPath(bool success, const FilePath& unused,
-                     const std::string& unused_also) {
-    EXPECT_FALSE(success);  // We told it not to create.
+  void OnValidate(base::PlatformFileError result) {
+    EXPECT_NE(base::PLATFORM_FILE_OK, result);  // We told it not to create.
   }
 
-  FileSystemMountPointProvider::GetRootPathCallback GetRootPathCallback() {
-    return base::Bind(&SandboxMountPointProviderMigrationTest::OnGetRootPath,
+  FileSystemMountPointProvider::ValidateFileSystemCallback
+  GetValidateCallback() {
+    return base::Bind(&SandboxMountPointProviderMigrationTest::OnValidate,
                       weak_factory_.GetWeakPtr());
   }
 
   void EnsureFileExists(const FilePath& path) {
     bool created = false;
     PlatformFileError error_code = base::PLATFORM_FILE_OK;
     PlatformFile handle = base::CreatePlatformFile(
         path,
         base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_READ,
         &created, &error_code);
@@ skipping 99 matching lines @@
     bool create = false;
     std::set<GURL> origins;
     std::string host = "the host with the most";
     int64 delta = 0;
 
     // We want to make sure that all the public methods of
     // SandboxMountPointProvider which might access the filesystem will cause a
     // migration if one is needed.
     switch (method) {
     case 0:
-      sandbox_provider()->ValidateFileSystemRootAndGetURL(
-          origin_url, type, create, GetRootPathCallback());
+      sandbox_provider()->ValidateFileSystemRoot(
+          origin_url, type, create, GetValidateCallback());
       MessageLoop::current()->RunAllPending();
       break;
     case 1:
-      sandbox_provider()->ValidateFileSystemRootAndGetPathOnFileThread(
+      sandbox_provider()->GetFileSystemRootPathOnFileThread(
           origin_url, type, FilePath(), create);
       break;
     case 2:
       sandbox_provider()->GetBaseDirectoryForOriginAndType(
           origin_url, type, create);
       break;
     case 3:
       sandbox_provider()->DeleteOriginDataOnFileThread(
           NULL, origin_url, type);
       break;
@@ skipping 83 matching lines @@
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod8) {
   RunMigrationTest(8);
 }
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod9) {
   RunMigrationTest(9);
 }
 
 }  // namespace fileapi