Allow duplicate payment method identifiers.

third_party/WebKit/Source/modules/payments/PaymentRequest.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/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 78 matching lines @@
 template <>
 struct TypeConverter<PaymentDetailsModifierPtr, blink::PaymentDetailsModifier> {
   static PaymentDetailsModifierPtr Convert(
       const blink::PaymentDetailsModifier& input) {
     PaymentDetailsModifierPtr output = PaymentDetailsModifier::New();
     output->supported_methods =
         WTF::Vector<WTF::String>(input.supportedMethods());
 
     if (input.hasTotal())
       output->total = PaymentItem::From(input.total());
-    else
-      output->total = PaymentItem::New();
 
     if (input.hasAdditionalDisplayItems()) {
       for (size_t i = 0; i < input.additionalDisplayItems().size(); ++i) {
         output->additional_display_items.append(
             PaymentItem::From(input.additionalDisplayItems()[i]));
       }
     }
     return output;
   }
 };
@@ skipping 155 matching lines @@
 
 void validatePaymentDetailsModifiers(
     const HeapVector<PaymentDetailsModifier>& modifiers,
     ExceptionState& exceptionState) {
   if (modifiers.isEmpty()) {
     exceptionState.throwTypeError(
         "Must specify at least one payment details modifier");
     return;
   }
 
-  HashSet<String> uniqueMethods;
   for (const auto& modifier : modifiers) {
     if (modifier.supportedMethods().isEmpty()) {
       exceptionState.throwTypeError(
           "Must specify at least one payment method identifier");
       return;
     }
 
-    for (const auto& method : modifier.supportedMethods()) {
-      if (uniqueMethods.contains(method)) {
-        exceptionState.throwTypeError(
-            "Duplicate payment method identifiers are not allowed");
-        return;
-      }
-      uniqueMethods.add(method);
-    }
-
     if (modifier.hasTotal()) {
       validateShippingOptionOrPaymentItem(modifier.total(), exceptionState);
       if (exceptionState.hadException())
         return;
 
       if (modifier.total().amount().value()[0] == '-') {
         exceptionState.throwTypeError(
             "Total amount value should be non-negative");
         return;
       }
@@ skipping 58 matching lines @@
 void validateAndConvertPaymentMethodData(
     const HeapVector<PaymentMethodData>& paymentMethodData,
     Vector<PaymentRequest::MethodData>* methodData,
     ExceptionState& exceptionState) {
   if (paymentMethodData.isEmpty()) {
     exceptionState.throwTypeError(
         "Must specify at least one payment method identifier");
     return;
   }
 
-  HashSet<String> uniqueMethods;
   for (const auto& pmd : paymentMethodData) {
     if (pmd.supportedMethods().isEmpty()) {
       exceptionState.throwTypeError(
           "Must specify at least one payment method identifier");
       return;
     }
 
-    for (const auto& method : pmd.supportedMethods()) {
-      if (uniqueMethods.contains(method)) {
-        exceptionState.throwTypeError(
-            "Duplicate payment method identifiers are not allowed");
-        return;
-      }
-      uniqueMethods.add(method);
-    }
-
     String stringifiedData = "";
     if (pmd.hasData() && !pmd.data().isEmpty()) {
       std::unique_ptr<JSONValue> value =
           toJSONValue(pmd.data().context(), pmd.data().v8Value());
       if (!value) {
         exceptionState.throwTypeError(
             "Unable to parse payment method specific data");
         return;
       }
       if (!value->isNull()) {
@@ skipping 469 matching lines @@
   m_completeTimer.stop();
   m_completeResolver.clear();
   m_showResolver.clear();
   m_abortResolver.clear();
   if (m_clientBinding.is_bound())
     m_clientBinding.Close();
   m_paymentProvider.reset();
 }
 
 }  // namespace blink