Deprecate FileSystemMountPointProvider::GetFileSystemRootPathOnFileThread

webkit/browser/fileapi/local_file_system_cross_operation_unittest.cc

 // Copyright (c) 2013 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 <map>
 #include <queue>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/async_file_test_helper.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/mock_file_system_context.h"
 #include "webkit/browser/fileapi/test_file_set.h"
 #include "webkit/common/fileapi/file_system_util.h"
 #include "webkit/quota/mock_quota_manager.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
 
 typedef FileSystemOperation::FileEntryList FileEntryList;
 
+namespace {
+
+void ExpectOk(base::PlatformFileError error) {
+  ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+}
+
+}  // namespace
+
 class CrossOperationTestHelper {
  public:
   CrossOperationTestHelper(
       const GURL& origin,
       FileSystemType src_type,
       FileSystemType dest_type)
       : origin_(origin),
         src_type_(src_type),
         dest_type_(dest_type) {}
 
@@ skipping 16 matching lines @@
     quota_manager_proxy_ = new quota::MockQuotaManagerProxy(
         quota_manager_,
         base::MessageLoopProxy::current());
     file_system_context_ = CreateFileSystemContextForTesting(
         quota_manager_proxy_,
         base_dir);
 
     // Prepare the origin's root directory.
     FileSystemMountPointProvider* mount_point_provider =
         file_system_context_->GetMountPointProvider(src_type_);
-    mount_point_provider->GetFileSystemRootPathOnFileThread(
-        SourceURL(std::string()), true /* create */);
+    mount_point_provider->ValidateFileSystemRoot(
+        origin_, src_type_, true /* create */, base::Bind(&ExpectOk));
     mount_point_provider =
         file_system_context_->GetMountPointProvider(dest_type_);
-    mount_point_provider->GetFileSystemRootPathOnFileThread(
-        DestURL(std::string()), true /* create */);
+    mount_point_provider->ValidateFileSystemRoot(
+        origin_, dest_type_, true /* create */, base::Bind(&ExpectOk));
+    base::MessageLoop::current()->RunUntilIdle();
 
     // Grant relatively big quota initially.
     quota_manager_->SetQuota(origin_,
                              FileSystemTypeToQuotaStorageType(src_type_),
                              1024 * 1024);
     quota_manager_->SetQuota(origin_,
                              FileSystemTypeToQuotaStorageType(dest_type_),
                              1024 * 1024);
   }
 
@@ skipping 325 matching lines @@
                              test::kRegularTestCaseSize);
 
   int64 src_new_usage = helper.GetSourceUsage();
   ASSERT_EQ(src_initial_usage, src_new_usage);
 
   int64 dest_increase = helper.GetDestUsage() - dest_initial_usage;
   ASSERT_EQ(src_increase, dest_increase);
 }
 
 }  // namespace fileapi