Revert of Change how the quota system computes the total poolsize for temporary storage

storage/browser/quota/quota_temporary_storage_evictor.h

 // Copyright 2013 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.
 
 #ifndef STORAGE_BROWSER_QUOTA_QUOTA_TEMPORARY_STORAGE_EVICTOR_H_
 #define STORAGE_BROWSER_QUOTA_QUOTA_TEMPORARY_STORAGE_EVICTOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
 #include "storage/browser/storage_browser_export.h"
 #include "storage/common/quota/quota_types.h"
 
 class GURL;
 
 namespace content {
 class QuotaTemporaryStorageEvictorTest;
 }
 
 namespace storage {
 
 class QuotaEvictionHandler;
-struct QuotaSettings;
+struct UsageAndQuota;
 
 class STORAGE_EXPORT QuotaTemporaryStorageEvictor : public base::NonThreadSafe {
  public:
   struct Statistics {
     Statistics()
         : num_errors_on_evicting_origin(0),
           num_errors_on_getting_usage_and_quota(0),
           num_evicted_origins(0),
           num_eviction_rounds(0),
           num_skipped_eviction_rounds(0) {}
@@ skipping 30 matching lines @@
 
   QuotaTemporaryStorageEvictor(QuotaEvictionHandler* quota_eviction_handler,
                                int64_t interval_ms);
   virtual ~QuotaTemporaryStorageEvictor();
 
   void GetStatistics(std::map<std::string, int64_t>* statistics);
   void ReportPerRoundHistogram();
   void ReportPerHourHistogram();
   void Start();
 
+  void reset_min_available_disk_space_to_start_eviction() {
+    min_available_to_start_eviction_ =
+        kMinAvailableToStartEvictionNotSpecified;
+  }
+  void set_min_available_disk_space_to_start_eviction(int64_t value) {
+    min_available_to_start_eviction_ = value;
+  }
+
  private:
   friend class content::QuotaTemporaryStorageEvictorTest;
 
   void StartEvictionTimerWithDelay(int delay_ms);
   void ConsiderEviction();
-  void OnGotEvictionRoundInfo(QuotaStatusCode status,
-                              const QuotaSettings& settings,
-                              int64_t available_space,
-                              int64_t total_space,
-                              int64_t current_usage,
-                              bool current_usage_is_complete);
+  void OnGotVolumeInfo(bool success,
+                       uint64_t available_space,
+                       uint64_t total_size);
+  void OnGotUsageAndQuotaForEviction(
+      int64_t must_remain_available_space,
+      QuotaStatusCode status,
+      const UsageAndQuota& quota_and_usage);
   void OnGotEvictionOrigin(const GURL& origin);
   void OnEvictionComplete(QuotaStatusCode status);
 
   void OnEvictionRoundStarted();
   void OnEvictionRoundFinished();
 
+  // This is only used for tests.
+  void set_repeated_eviction(bool repeated_eviction) {
+    repeated_eviction_ = repeated_eviction;
+  }
+
+  static const int kMinAvailableToStartEvictionNotSpecified;
+
+  int64_t min_available_to_start_eviction_;
+
   // Not owned; quota_eviction_handler owns us.
   QuotaEvictionHandler* quota_eviction_handler_;
 
   Statistics statistics_;
   Statistics previous_statistics_;
   EvictionRoundStatistics round_statistics_;
   base::Time time_of_end_of_last_nonskipped_round_;
   base::Time time_of_end_of_last_round_;
   std::set<GURL> in_progress_eviction_origins_;
 
   int64_t interval_ms_;
-  bool timer_disabled_for_testing_;
+  bool repeated_eviction_;
 
   base::OneShotTimer eviction_timer_;
   base::RepeatingTimer histogram_timer_;
   base::WeakPtrFactory<QuotaTemporaryStorageEvictor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaTemporaryStorageEvictor);
 };
 
 }  // namespace storage
 
 #endif  // STORAGE_BROWSER_QUOTA_QUOTA_TEMPORARY_STORAGE_EVICTOR_H_