Implement GetUsageAndQuotaForEviction in QuotaManager.

webkit/quota/quota_manager_unittest.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 <vector>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_temp_dir.h"
@@ skipping 131 matching lines @@
   }
 
   void GetAvailableSpace() {
     quota_status_ = kQuotaStatusUnknown;
     quota_ = -1;
     quota_manager_->GetAvailableSpace(
         callback_factory_.NewCallback(
             &QuotaManagerTest::DidGetQuota));
   }
 
+  void GetUsageAndQuotaForEviction() {
+    quota_status_ = kQuotaStatusUnknown;
+    usage_ = -1;
+    quota_ = -1;
+    available_space_ = -1;
+    quota_manager_->GetUsageAndQuotaForEviction(
+        callback_factory_.NewCallback(
+            &QuotaManagerTest::DidGetUsageAndQuotaForEviction));
+  }
+
   void DidGetUsageAndQuota(QuotaStatusCode status, int64 usage, int64 quota) {
     quota_status_ = status;
     usage_ = usage;
     quota_ = quota;
   }
 
   void DidGetQuota(QuotaStatusCode status, int64 quota) {
     quota_status_ = status;
     quota_ = quota;
   }
 
   void DidGetHostQuota(QuotaStatusCode status,
                        const std::string& host, int64 quota) {
     quota_status_ = status;
     host_ = host;
     quota_ = quota;
   }
 
   void DidGetGlobalUsage(int64 usage) {
     usage_ = usage;
   }
 
   void DidGetHostUsage(const std::string&, int64 usage) {
     usage_ = usage;
   }
 
+  void DidGetUsageAndQuotaForEviction(QuotaStatusCode status,
+      int64 usage, int64 quota, int64 available_space) {
+    quota_status_ = status;
+    usage_ = usage;
+    quota_ = quota;
+    available_space_ = available_space;
+  }
+
   void DidDelete(QuotaStatusCode status) {
     quota_status_ = status;
   }
 
   void set_additional_callback_count(int c) { additional_callback_count_ = c; }
   int additional_callback_count() const { return additional_callback_count_; }
   void DidGetUsageAndQuotaAdditional(
       QuotaStatusCode status, int64 usage, int64 quota) {
     ++additional_callback_count_;
   }
 
   QuotaManager* quota_manager() const { return quota_manager_.get(); }
   void set_quota_manager(QuotaManager* quota_manager) {
     quota_manager_ = quota_manager;
   }
 
   QuotaStatusCode status() const { return quota_status_; }
   int64 usage() const { return usage_; }
   int64 quota() const { return quota_; }
+  int64 available_space() const { return available_space_; }
   FilePath profile_path() const { return data_dir_.path(); }
 
  private:
   ScopedTempDir data_dir_;
   base::ScopedCallbackFactory<QuotaManagerTest> callback_factory_;
 
   scoped_refptr<QuotaManager> quota_manager_;
 
   QuotaStatusCode quota_status_;
   std::string host_;
   int64 usage_;
   int64 quota_;
+  int64 available_space_;
 
   int additional_callback_count_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaManagerTest);
 };
 
 TEST_F(QuotaManagerTest, GetUsageAndQuota_Simple) {
   static const MockOriginData kData[] = {
     { "http://foo.com/",     kStorageTypeTemporary,  10 },
     { "http://foo.com/",     kStorageTypePersistent, 80 },
@@ skipping 510 matching lines @@
 }
 
 TEST_F(QuotaManagerTest, GetAvailableSpaceTest) {
   GetAvailableSpace();
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(kQuotaStatusOk, status());
   EXPECT_LE(0, quota());
   int64 direct_called = base::SysInfo::AmountOfFreeDiskSpace(profile_path());
   EXPECT_EQ(direct_called, quota());
 }
+
+TEST_F(QuotaManagerTest, GetUsageAndQuotaForEviction) {
+  static const MockOriginData kData[] = {
+    { "http://foo.com/",   kStorageTypeTemporary,        1 },
+    { "http://foo.com:1/", kStorageTypeTemporary,       20 },
+    { "http://foo.com/",   kStorageTypePersistent,     300 },
+    { "http://bar.com/",   kStorageTypeTemporary,     4000 },
+  };
+  MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+  RegisterClient(client);
+
+  SetTemporaryGlobalQuota(10000000);
+  MessageLoop::current()->RunAllPending();
+
+  GetUsageAndQuotaForEviction();
+  MessageLoop::current()->RunAllPending();
+  EXPECT_EQ(kQuotaStatusOk, status());
+  EXPECT_EQ(4021, usage());
+  EXPECT_EQ(10000000, quota());
+
+  // TODO(dmikurube): It might be flaky?  (Also in GetAvailableSpaceTest.)

[kinuko, 2011/05/18 10:02:45]

Oh that is true.  Sorry could you change this test (and the one in
GetAvailableSpaceTest) to EXPECT_GE(0, available_space()) or something?

[Dai Mikurube (NOT FULLTIME), 2011/05/18 11:35:25]

Done for GetUsageAndQuotaForEviction with EXPECT_LE.
Mofified GetAvailableSpaceTest to update "available_space", not "quota".  Then
removed direct_called.

+  int64 direct_called = base::SysInfo::AmountOfFreeDiskSpace(profile_path());
+  EXPECT_EQ(direct_called, available_space());
+}
+
 }  // namespace quota