Deprecate FileSystemMountPointProvider::GetFileSystemRootPathOnFileThread

webkit/browser/fileapi/sandbox_file_system_test_helper.cc

 // Copyright (c) 2012 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/browser/fileapi/sandbox_file_system_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
@@ skipping 43 matching lines @@
       quota_manager_proxy, base_dir);
 
   SetUpFileSystem();
 }
 
 void SandboxFileSystemTestHelper::TearDown() {
   file_system_context_ = NULL;
   base::MessageLoop::current()->RunUntilIdle();
 }
 
-base::FilePath SandboxFileSystemTestHelper::GetOriginRootPath() const {
+base::FilePath SandboxFileSystemTestHelper::GetOriginRootPath() {
   return file_system_context_->sandbox_provider()->
       GetBaseDirectoryForOriginAndType(origin_, type_, false);
 }
 
 base::FilePath SandboxFileSystemTestHelper::GetLocalPath(
     const base::FilePath& path) {
   DCHECK(file_util_);
   base::FilePath local_path;
   scoped_ptr<FileSystemOperationContext> context(NewOperationContext());
   file_util_->GetLocalFilePath(context.get(), CreateURL(path), &local_path);
@@ skipping 22 matching lines @@
 
 int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() {
   usage_cache()->CloseCacheFiles();
   int64 size = file_util::ComputeDirectorySize(GetOriginRootPath());
   if (file_util::PathExists(GetUsageCachePath()))
     size -= FileSystemUsageCache::kUsageFileSize;
   return size;
 }
 
 int64
-SandboxFileSystemTestHelper::ComputeCurrentDirectoryDatabaseUsage() const {
+SandboxFileSystemTestHelper::ComputeCurrentDirectoryDatabaseUsage() {
   return file_util::ComputeDirectorySize(
       GetOriginRootPath().AppendASCII("Paths"));
 }
 
 LocalFileSystemOperation* SandboxFileSystemTestHelper::NewOperation() {
   DCHECK(file_system_context_.get());
   DCHECK(file_util_);
   LocalFileSystemOperation* operation = static_cast<LocalFileSystemOperation*>(
       file_system_context_->CreateFileSystemOperation(
           CreateURL(base::FilePath()), NULL));
@@ skipping 16 matching lines @@
 
 void SandboxFileSystemTestHelper::SetUpFileSystem() {
   DCHECK(file_system_context_);
   DCHECK(file_system_context_->sandbox_provider()->CanHandleType(type_));
 
   file_util_ = file_system_context_->GetFileUtil(type_);
   DCHECK(file_util_);
 
   // Prepare the origin's root directory.
   file_system_context_->sandbox_provider()->
-      GetFileSystemRootPathOnFileThread(CreateURL(base::FilePath()),
-                                        true /* create */);
+      GetBaseDirectoryForOriginAndType(origin_, type_, true /* create */);
 
   // Initialize the usage cache file.
   base::FilePath usage_cache_path = GetUsageCachePath();
   if (!usage_cache_path.empty())
     usage_cache()->UpdateUsage(usage_cache_path, 0);
 }
 
 }  // namespace fileapi