DCHECK in BudgetService getCost and reserve if an invalid type is supplied.

third_party/WebKit/Source/modules/budget/BudgetService.cpp

 // 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 "modules/budget/BudgetService.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 47 matching lines @@
 ScriptPromise BudgetService::getCost(ScriptState* scriptState,
                                      const AtomicString& operation) {
   DCHECK(m_service);
 
   String errorMessage;
   if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
     return ScriptPromise::rejectWithDOMException(
         scriptState, DOMException::create(SecurityError, errorMessage));
 
   mojom::blink::BudgetOperationType type = stringToOperationType(operation);
-  if (type == mojom::blink::BudgetOperationType::INVALID_OPERATION)
-    return ScriptPromise::rejectWithDOMException(
-        scriptState, DOMException::create(NotSupportedError,
-                                          "Invalid operation type specified"));
+  DCHECK(type != mojom::blink::BudgetOperationType::INVALID_OPERATION);

[Peter Beverloo, 2016/12/12 14:22:00]

Please check whether the following works instead:

  DCHECK_NE(type, mojom::blink::BudgetOperationType::INVALID_OPERATION);

(Which produces slightly nicer error messages.)

[harkness, 2016/12/12 15:00:43]

I didn't realize the macro was flexible enough to do the comparison, very cool.

Done.

 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   // Get the cost for the action from the browser BudgetService.
   m_service->GetCost(type, convertToBaseCallback(WTF::bind(
                                &BudgetService::gotCost, wrapPersistent(this),
                                wrapPersistent(resolver))));
   return promise;
 }
@@ skipping 40 matching lines @@
         new BudgetState(expectations[i]->budget_at, expectations[i]->time);
 
   resolver->resolve(budget);
 }
 
 ScriptPromise BudgetService::reserve(ScriptState* scriptState,
                                      const AtomicString& operation) {
   DCHECK(m_service);
 
   mojom::blink::BudgetOperationType type = stringToOperationType(operation);
-  if (type == mojom::blink::BudgetOperationType::INVALID_OPERATION)
-    return ScriptPromise::rejectWithDOMException(
-        scriptState, DOMException::create(NotSupportedError,
-                                          "Invalid operation type specified"));
+  DCHECK(type != mojom::blink::BudgetOperationType::INVALID_OPERATION);
 
   String errorMessage;
   if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
     return ScriptPromise::rejectWithDOMException(
         scriptState, DOMException::create(SecurityError, errorMessage));
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   // Call to the BudgetService to place the reservation.
@@ skipping 16 matching lines @@
 
   resolver->resolve(success);
 }
 
 void BudgetService::onConnectionError() {
   LOG(ERROR) << "Unable to connect to the Mojo BudgetService.";
   // TODO(harkness): Reject in flight promises.
 }
 
 }  // namespace blink