Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/sandbox_mount_point_provider_unittest.cc

Index: webkit/fileapi/sandbox_mount_point_provider_unittest.cc
diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
index e9776d45fcf4ad69c4cbb2a6643349fa91155c4d..c5099e313481cd21fece2062407331739080b41c 100644
--- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
@@ -157,13 +157,13 @@ class SandboxMountPointProviderMigrationTest : public testing::Test {
     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());
   }
 
@@ -283,12 +283,12 @@ class SandboxMountPointProviderMigrationTest : public testing::Test {
     // 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: