Revert 84771 - Fix QuotaFileUtil to write .usage into the same directory as "chrome-", not under ...

webkit/fileapi/quota_file_util.cc

 // Copyright (c) 2011 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/fileapi/quota_file_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 namespace fileapi {
 
 const int64 QuotaFileUtil::kNoLimit = kint64max;
 
 namespace {
 
 // Checks if copying in the same filesystem can be performed.
 // This method is not called for moving within a single filesystem.
 static bool CanCopy(
@@ skipping 13 matching lines @@
       src_file_info.size - dest_file_info.size > allowed_bytes_growth)
     return false;
   if (growth != NULL)
     *growth = src_file_info.size - dest_file_info.size;
 
   return true;
 }
 
 static FilePath InitUsageFile(FileSystemOperationContext* fs_context) {
   FilePath base_path = fs_context->file_system_context()->path_manager()->
-      sandbox_provider()->GetBaseDirectoryForOriginAndType(
-          fs_context->src_origin_url(), fs_context->src_type());
+      ValidateFileSystemRootAndGetPathOnFileThread(fs_context->src_origin_url(),
+          fs_context->src_type(), FilePath(), false);
   FilePath usage_file_path =
       base_path.AppendASCII(FileSystemUsageCache::kUsageFileName);
 
   if (FileSystemUsageCache::Exists(usage_file_path))
     FileSystemUsageCache::IncrementDirty(usage_file_path);
 
   return usage_file_path;
 }
 
 static void UpdateUsageFile(const FilePath& usage_file_path, int64 growth) {
@@ skipping 89 matching lines @@
 
   base::PlatformFileError error = FileSystemFileUtil::GetInstance()->Truncate(
       fs_context, path, length);
 
   UpdateUsageFile(usage_file_path, growth);
 
   return error;
 }
 
 }  // namespace fileapi