Add data parameter to payment details modifier.

components/payments/payment_details_validation.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 "components/payments/payment_details_validation.h"
 
 #include <set>
 #include <vector>
 
 #include "components/payments/payment_request.mojom.h"
@@ skipping 90 matching lines @@
 
 bool validatePaymentDetailsModifiers(
     const std::vector<payments::mojom::PaymentDetailsModifierPtr>& modifiers,
     const payments::mojom::PaymentItemPtr& total,
     std::string* error_message) {
   if (modifiers.empty()) {
     *error_message = "Must specify at least one payment details modifier";
     return false;
   }
 
-  std::set<mojo::String> uniqueMethods;
   for (const auto& modifier : modifiers) {
-    if (modifier->supported_methods.empty()) {
+    if (!modifier->method_data) {

[Kevin Bailey, 2016/11/29 17:27:59]

This looks fine; it just concerns me that the IDL continues to change this late.

[please use gerrit instead, 2016/11/29 19:26:52]

Acknowledged.

+      *error_message = "Method data required";
+      return false;
+    }
+
+    if (modifier->method_data->supported_methods.empty()) {
       *error_message = "Must specify at least one payment method identifier";
       return false;
     }
 
-    for (const auto& method : modifier->supported_methods) {
-      if (uniqueMethods.find(method) != uniqueMethods.end()) {
-        *error_message = "Duplicate payment method identifiers are not allowed";
-        return false;
-      }
-      uniqueMethods.insert(method);
-    }
-
     if (modifier->total) {
       if (!validateShippingOptionOrPaymentItem(modifier->total, total,
                                                error_message))
         return false;
 
       if (modifier->total->amount->value[0] == '-') {
         *error_message = "Total amount value should be non-negative";
         return false;
       }
     }
@@ skipping 44 matching lines @@
     if (!validatePaymentDetailsModifiers(details->modifiers, details->total,
                                          error_message))
       return false;
   }
   if (!PaymentsValidators::isValidErrorMsgFormat(details->error, error_message))
     return false;
   return true;
 }
 
 }  // namespace payments