Cleanup FileSystemOperation for preparing for adding FSO-factory method

webkit/fileapi/file_system_mount_point_provider_unittest.cc

Index: webkit/fileapi/file_system_mount_point_provider_unittest.cc
diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
index f9f3fa47c07d6471a10bc440a1d5d2a5fc31c82b..e1778ad22bf4296be74ec9ff3e1ee7391ce4029f 100644
--- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
@@ -223,7 +223,6 @@ class FileSystemMountPointProviderTest : public testing::Test {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     root_path_callback_status_ = false;
     root_path_.clear();
-    file_system_name_.clear();
     special_storage_policy_ = new quota::MockSpecialStoragePolicy;
   }
 
@@ -248,26 +247,15 @@ class FileSystemMountPointProviderTest : public testing::Test {
     return file_system_context_->GetMountPointProvider(type);
   }
 
-  void OnGetRootPath(bool success,
-                     const FilePath& root_path,
-                     const std::string& name) {
-    root_path_callback_status_ = success;
-    root_path_ = root_path;
-    file_system_name_ = name;
-  }
-
   bool GetRootPath(const GURL& origin_url,
                    fileapi::FileSystemType type,
                    bool create,
                    FilePath* root_path) {
-    provider(type)->ValidateFileSystemRootAndGetURL(
-        origin_url, type, create,
-        base::Bind(&FileSystemMountPointProviderTest::OnGetRootPath,
-                   weak_factory_.GetWeakPtr()));
-    MessageLoop::current()->RunAllPending();
+    root_path_ = provider(type)->GetFileSystemRootPathOnFileThread(
+        origin_url, type, FilePath(), create);
     if (root_path)
       *root_path = root_path_;
-    return root_path_callback_status_;
+    return !root_path_.empty();
   }
 
   FilePath data_path() { return data_dir_.path(); }
@@ -288,7 +276,6 @@ class FileSystemMountPointProviderTest : public testing::Test {
 
   bool root_path_callback_status_;
   FilePath root_path_;
-  std::string file_system_name_;
 
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<FileSystemContext> file_system_context_;