Connect Mojo budget_service to BudgetManager implementation of Reserve.

chrome/browser/budget_service/budget_manager.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_manager.h"
 
 #include <stdint.h>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
@@ skipping 57 matching lines @@
 void BudgetManager::GetBudget(const GURL& origin,
                               const GetBudgetCallback& callback) {
   db_.GetBudgetDetails(origin, callback);
 }
 
 void BudgetManager::Reserve(const GURL& origin,
                             blink::mojom::BudgetOperationType type,
                             const ReserveCallback& callback) {
   DCHECK_EQ(origin, origin.GetOrigin());
 
-  db_.SpendBudget(
-      origin, GetCost(type),
-      base::Bind(&BudgetManager::DidReserve, weak_ptr_factory_.GetWeakPtr(),
-                 origin, type, callback));
+  db_.SpendBudget(origin, GetCost(type),
+                  base::Bind(&BudgetManager::DidReserve,
+                             weak_ptr_factory_.GetWeakPtr(), origin, callback));
 }
 
 void BudgetManager::Consume(const GURL& origin,
                             blink::mojom::BudgetOperationType type,
                             const ConsumeCallback& callback) {
   DCHECK_EQ(origin, origin.GetOrigin());
   bool found_reservation = false;
 
   // First, see if there is a reservation already.
   auto count = reservation_map_.find(origin.spec());
   if (count != reservation_map_.end()) {
     if (count->second == 1)
       reservation_map_.erase(origin.spec());
     else
       reservation_map_[origin.spec()]--;
     found_reservation = true;
   }
 
   if (found_reservation) {
     callback.Run(true);
     return;
   }
 
   // If there wasn't a reservation already, try to directly consume budget.
   // The callback will return directly to the caller.
-  db_.SpendBudget(origin, GetCost(type), callback);
+  db_.SpendBudget(origin, GetCost(type),
+                  base::Bind(&BudgetManager::DidConsume,
+                             weak_ptr_factory_.GetWeakPtr(), callback));
+}
+
+void BudgetManager::DidConsume(const ConsumeCallback& callback,
+                               blink::mojom::BudgetServiceErrorType error,
+                               bool success) {
+  // The caller of Consume only cares whether it succeeded or failed and not
+  // why. So, only return a combined bool.
+  if (error != blink::mojom::BudgetServiceErrorType::NONE || !success) {

[Peter Beverloo, 2016/09/08 17:16:06]

Let's remove "!success" from this conditional, so that it'll solely handle the
"a database error occurred" case. The "database's happy, but no budget" case is
captured by line 120 already.

[harkness, 2016/09/13 13:41:29]

Good point. Updated.

+    callback.Run(false /* success */);
+    return;
+  }
+  callback.Run(success);
 }
 
 void BudgetManager::DidReserve(const GURL& origin,
-                               blink::mojom::BudgetOperationType type,
                                const ReserveCallback& callback,
+                               blink::mojom::BudgetServiceErrorType error,
                                bool success) {
-  if (!success) {
-    callback.Run(false);
-    return;
-  }
+  // If the call succeeded, write the new reservation into the map.
+  if (success && error == blink::mojom::BudgetServiceErrorType::NONE)
+    reservation_map_[origin.spec()]++;
 
-  // Write the new reservation into the map.
-  reservation_map_[origin.spec()]++;
-  callback.Run(true);
+  callback.Run(error, success);
 }