Simplify directory path accounting.

webkit/fileapi/sandbox_mount_point_provider.cc

Index: webkit/fileapi/sandbox_mount_point_provider.cc
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc
index 920a8209831775d62b745735eac15f0e39838f7f..d73877b2d7c1f70d5503642c5df4ddc9a2eff14e 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider.cc
@@ -279,11 +279,10 @@ SandboxMountPointProvider::SandboxMountPointProvider(
       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() {
@@ -563,8 +562,10 @@ int64 SandboxMountPointProvider::GetOriginUsageOnFileThread(
       else
         usage += file_info.size;
     }
-    usage += quota_file_util_->ComputeFilePathCost(file_path_each);
+    usage += ObfuscatedFileSystemFileUtil::ComputeFilePathCost(file_path_each);
   }
+  if (usage)  // Don't confuse people with empty filesystems.
+    usage += FileSystemUsageCache::kUsageFileSize;
   // This clears the dirty flag too.
   FileSystemUsageCache::UpdateUsage(usage_file_path, usage);
   return usage;