Modify FileSystemUsageCache::GetUsage to get the size even if dirty > 0, and add GetDirty.

BUG=74841
TEST=FileSystemUsageCacheTest.*


Review URL: http://codereview.chromium.org/6904044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83141 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/webkit/fileapi/file_system_usage_tracker.cc b/webkit/fileapi/file_system_usage_tracker.cc
index 85943a5..687884f 100644
--- a/webkit/fileapi/file_system_usage_tracker.cc
+++ b/webkit/fileapi/file_system_usage_tracker.cc
@@ -59,9 +59,8 @@ class FileSystemUsageTracker::GetUsageTask
     else {
       FilePath usage_file_path = origin_base_path_.AppendASCII(
           FileSystemUsageCache::kUsageFileName);
-      fs_usage_ = FileSystemUsageCache::GetUsage(usage_file_path);
 
-      if (fs_usage_ < 0) {
+      if (FileSystemUsageCache::GetDirty(usage_file_path) != 0) {
         FilePath content_file_path = origin_base_path_;
         if (FileSystemUsageCache::Exists(usage_file_path))
           FileSystemUsageCache::Delete(usage_file_path);
@@ -70,6 +69,8 @@ class FileSystemUsageTracker::GetUsageTask
         // The result of ComputeDirectorySize does not include it.
         fs_usage_ += FileSystemUsageCache::kUsageFileSize;
         FileSystemUsageCache::UpdateUsage(usage_file_path, fs_usage_);
+      } else {
+        fs_usage_ = FileSystemUsageCache::GetUsage(usage_file_path);
       }
     }