Deprecate FileSystemMountPointProvider::GetFileSystemRootPathOnFileThread

webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc

 // Copyright 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/async_file_test_helper.h"
 #include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/browser/fileapi/external_mount_points.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_url.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/browser/fileapi/mock_file_system_context.h"
 #include "webkit/browser/fileapi/test_mount_point_provider.h"
 #include "webkit/common/fileapi/file_system_util.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
 
 namespace {
 
 const FileSystemType kNoValidatorType = kFileSystemTypeTemporary;
 const FileSystemType kWithValidatorType = kFileSystemTypeTest;
 
+void ExpectOk(base::PlatformFileError error) {
+  ASSERT_EQ(base::PLATFORM_FILE_OK, error);
+}
+
 class CopyOrMoveFileValidatorTestHelper {
  public:
   CopyOrMoveFileValidatorTestHelper(
       const GURL& origin,
       FileSystemType src_type,
       FileSystemType dest_type)
       : origin_(origin),
         src_type_(src_type),
         dest_type_(dest_type) {}
 
@@ skipping 10 matching lines @@
 
     // Set up TestMountPointProvider to require CopyOrMoveFileValidator.
     FileSystemMountPointProvider* test_mount_point_provider =
         file_system_context_->GetMountPointProvider(kWithValidatorType);
     static_cast<TestMountPointProvider*>(test_mount_point_provider)->
         set_require_copy_or_move_validator(true);
 
     // Sets up source.
     FileSystemMountPointProvider* src_mount_point_provider =
         file_system_context_->GetMountPointProvider(src_type_);
-    src_mount_point_provider->GetFileSystemRootPathOnFileThread(
-        SourceURL(std::string()), true /* create */);
+    src_mount_point_provider->ValidateFileSystemRoot(
+        origin_, src_type_, true /* create */, base::Bind(&ExpectOk));
+    base::MessageLoop::current()->RunUntilIdle();
     ASSERT_EQ(base::PLATFORM_FILE_OK, CreateDirectory(SourceURL("")));
 
     // Sets up dest.
     DCHECK_EQ(kWithValidatorType, dest_type_);
     ASSERT_EQ(base::PLATFORM_FILE_OK, CreateDirectory(DestURL("")));
 
     copy_src_ = SourceURL("copy_src.jpg");
     move_src_ = SourceURL("move_src.jpg");
     copy_dest_ = DestURL("copy_dest.jpg");
     move_dest_ = DestURL("move_dest.jpg");
@@ skipping 199 matching lines @@
 
   scoped_ptr<CopyOrMoveFileValidatorFactory> accept_factory(
       new TestCopyOrMoveFileValidatorFactory(true /*accept_all*/));
   helper.SetMediaCopyOrMoveFileValidatorFactory(accept_factory.Pass());
 
   helper.CopyTest(base::PLATFORM_FILE_ERROR_SECURITY);
   helper.MoveTest(base::PLATFORM_FILE_ERROR_SECURITY);
 }
 
 }  // namespace fileapi