Cleanup budget_database based on evolving API.

chrome/browser/budget_service/budget_database.cc

 // Copyright 2016 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 "chrome/browser/budget_service/budget_database.h"
 
 #include "base/containers/adapters.h"
 #include "base/time/clock.h"
 #include "base/time/default_clock.h"
 #include "chrome/browser/budget_service/budget.pb.h"
@@ skipping 54 matching lines @@
 }
 
 void BudgetDatabase::AddBudget(const GURL& origin,
                                double amount,
                                const StoreBudgetCallback& callback) {
   DCHECK_EQ(origin.GetOrigin(), origin);
 
   // Add a new chunk of budget for the origin at the default expiration time.
   base::Time expiration =
       clock_->Now() + base::TimeDelta::FromHours(kBudgetDurationInHours);
-  budget_map_[origin.spec()].second.push_back(
-      std::make_pair(amount, expiration));
+  budget_map_[origin.spec()].push_back(BudgetChunk(amount, expiration));

[Peter Beverloo, 2016/08/10 15:36:44]

nit: could rewrite this as:

budget_map_[origin.spec()].emplace_back(amount, expiration);

[harkness, 2016/08/10 16:41:54]

Done.

 
   // Now that the cache is updated, write the data to the database.
   WriteCachedValuesToDatabase(origin, callback);
 }
 
 void BudgetDatabase::OnDatabaseInit(bool success) {
   // TODO(harkness): Consider caching the budget database now?
 }
 
 bool BudgetDatabase::IsCached(const GURL& origin) const {
   return budget_map_.find(origin.spec()) != budget_map_.end();
 }
 
 void BudgetDatabase::AddToCache(
     const GURL& origin,
     const AddToCacheCallback& callback,
     bool success,
     std::unique_ptr<budget_service::Budget> budget_proto) {
   // If the database read failed, there's nothing to add to the cache.
   if (!success || !budget_proto) {
     callback.Run(success);
     return;
   }
 
   // Add the data to the cache, converting from the proto format to an STL
   // format which is better for removing things from the list.
   BudgetChunks chunks;
   for (const auto& chunk : budget_proto->budget())
-    chunks.push_back(std::make_pair(
+    chunks.push_back(BudgetChunk(
         chunk.amount(), base::Time::FromInternalValue(chunk.expiration())));

[Peter Beverloo, 2016/08/10 15:36:44]

micro nit: {} since this no longer is a single-lined statement

[harkness, 2016/08/10 16:41:54]

Done.

 
-  DCHECK(budget_proto->has_debt());
-  budget_map_[origin.spec()] =
-      std::make_pair(budget_proto->debt(), std::move(chunks));
+  budget_map_[origin.spec()] = std::move(chunks);
 
   callback.Run(success);
 }
 
 void BudgetDatabase::DidGetBudget(const GURL& origin,
                                   const GetBudgetDetailsCallback& callback,
                                   bool success) {
   // If the database wasn't able to read the information, return the
   // failure and an empty BudgetExpectation.
   if (!success) {
-    callback.Run(success, 0, BudgetExpectation());
+    callback.Run(success, BudgetExpectation());
     return;
   }
 
   // First, cleanup any expired budget chunks for the origin.
   CleanupExpiredBudget(origin);
 
   // Now, build up the BudgetExpection. This is different from the format
   // in which the cache stores the data. The cache stores chunks of budget and
   // when that budget expires. The BudgetExpectation describes a set of times
   // and the budget at those times.
   BudgetExpectation expectation;
   double total = 0;
-  double debt = 0;
 
   if (IsCached(origin)) {
     // Starting with the chunks that expire the farthest in the future, build up
     // the budget expectations for those future times.
-    const BudgetInfo& info = budget_map_[origin.spec()];
-    for (const auto& chunk : base::Reversed(info.second)) {
-      expectation.push_front(std::make_pair(total, chunk.second));
-      total += chunk.first;
+    const BudgetChunks& chunks = budget_map_[origin.spec()];
+    for (const auto& chunk : base::Reversed(chunks)) {
+      expectation.push_front(BudgetStatus(total, chunk.expiration));

[Peter Beverloo, 2016/08/10 15:36:44]

dito, but with emplace_front() instead. Also on line 143.

[harkness, 2016/08/10 16:41:55]

Done.

+      total += chunk.amount;
     }
-    debt = info.first;
   }
 
   // Always add one entry at the front of the list for the total budget now.
-  expectation.push_front(std::make_pair(total, clock_->Now()));
+  expectation.push_front(BudgetStatus(total, clock_->Now()));
 
-  callback.Run(true /* success */, debt, expectation);
+  callback.Run(true /* success */, expectation);
 }
 
 void BudgetDatabase::SetClockForTesting(std::unique_ptr<base::Clock> clock) {
   clock_ = std::move(clock);
 }
 
 void BudgetDatabase::WriteCachedValuesToDatabase(
     const GURL& origin,
     const StoreBudgetCallback& callback) {
   // First, cleanup any expired budget chunks for the origin.
   CleanupExpiredBudget(origin);
 
   // Create the data structures that are passed to the ProtoDatabase.
   std::unique_ptr<
       leveldb_proto::ProtoDatabase<budget_service::Budget>::KeyEntryVector>
       entries(new leveldb_proto::ProtoDatabase<
               budget_service::Budget>::KeyEntryVector());
   std::unique_ptr<std::vector<std::string>> keys_to_remove(
       new std::vector<std::string>());
 
   // Each operation can either update the existing budget or remove the origin's
   // budget information.
   if (IsCached(origin)) {
     // Build the Budget proto object.
     budget_service::Budget budget;
-    const BudgetInfo& info = budget_map_[origin.spec()];
-    budget.set_debt(info.first);
-    for (const auto& chunk : info.second) {
+    const BudgetChunks& chunks = budget_map_[origin.spec()];
+    for (const auto& chunk : chunks) {
       budget_service::BudgetChunk* budget_chunk = budget.add_budget();
-      budget_chunk->set_amount(chunk.first);
-      budget_chunk->set_expiration(chunk.second.ToInternalValue());
+      budget_chunk->set_amount(chunk.amount);
+      budget_chunk->set_expiration(chunk.expiration.ToInternalValue());
     }
     entries->push_back(std::make_pair(origin.spec(), budget));
   } else {
     // If the origin doesn't exist in the cache, this is a remove operation.
     keys_to_remove->push_back(origin.spec());
   }
 
   // Send the updates to the database.
   db_->UpdateEntries(std::move(entries), std::move(keys_to_remove), callback);
 }
 
 void BudgetDatabase::CleanupExpiredBudget(const GURL& origin) {
   if (!IsCached(origin))
     return;
 
   base::Time now = clock_->Now();
 
-  BudgetChunks& chunks = budget_map_[origin.spec()].second;
+  BudgetChunks& chunks = budget_map_[origin.spec()];
   auto cleanup_iter = chunks.begin();
 
   // This relies on the list of chunks being in timestamp order.
-  while (cleanup_iter != chunks.end() && cleanup_iter->second <= now)
+  while (cleanup_iter != chunks.end() && cleanup_iter->expiration <= now)
     cleanup_iter = chunks.erase(cleanup_iter);
 
   // If the entire budget is empty now, cleanup the map.
   if (chunks.empty())
     budget_map_.erase(origin.spec());
 }