Simplify directory path accounting.

webkit/fileapi/sandbox_mount_point_provider.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/sandbox_mount_point_provider.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 261 matching lines @@
         FILE_PATH_LITERAL("FS.old");
 
 SandboxMountPointProvider::SandboxMountPointProvider(
     FileSystemPathManager* path_manager,
     scoped_refptr<base::MessageLoopProxy> file_message_loop,
     const FilePath& profile_path)
     : FileSystemQuotaUtil(file_message_loop),
       path_manager_(path_manager),
       file_message_loop_(file_message_loop),
       profile_path_(profile_path),
-      quota_file_util_(QuotaFileUtil::CreateDefault()),
       sandbox_file_util_(
           new ObfuscatedFileSystemFileUtil(
               profile_path.Append(kNewFileSystemDirectory),
-              quota_file_util_)) {
+              QuotaFileUtil::CreateDefault())) {
 }
 
 SandboxMountPointProvider::~SandboxMountPointProvider() {
   if (!file_message_loop_->BelongsToCurrentThread())
     file_message_loop_->ReleaseSoon(FROM_HERE, sandbox_file_util_.release());
 }
 
 bool SandboxMountPointProvider::IsAccessAllowed(const GURL& origin_url,
                                                 FileSystemType type,
                                                 const FilePath& unused) {
@@ skipping 259 matching lines @@
     base::PlatformFileInfo file_info;
     FilePath platform_file_path;
     if (!enumerator->IsDirectory()) {
       base::PlatformFileError error = sandbox_file_util_->GetFileInfo(
           &context, file_path_each, &file_info, &platform_file_path);
       if (error != base::PLATFORM_FILE_OK)
         NOTREACHED();
       else
         usage += file_info.size;
     }
-    usage += quota_file_util_->ComputeFilePathCost(file_path_each);
+    usage += ObfuscatedFileSystemFileUtil::ComputeFilePathCost(file_path_each);
   }
   // This clears the dirty flag too.
   FileSystemUsageCache::UpdateUsage(usage_file_path, usage);
   return usage;
 }
 
 void SandboxMountPointProvider::NotifyOriginWasAccessedOnIOThread(
     QuotaManagerProxy* proxy, const GURL& origin_url,
     fileapi::FileSystemType type) {
   DCHECK(type == fileapi::kFileSystemTypeTemporary ||
@@ skipping 75 matching lines @@
 
   // Creates the root directory.
   root = origin_base_path.Append(OldCreateUniqueDirectoryName(origin_url));
   if (!file_util::CreateDirectory(root))
     return FilePath();
 
   return root;
 }
 
 }  // namespace fileapi