PaymentRequest: Remove id attribute from PaymentItem.

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 38 matching lines @@
         output->value = input.value();
         return output;
     }
 };
 
 template <>
 struct TypeConverter<PaymentItemPtr, blink::PaymentItem> {
     static PaymentItemPtr Convert(const blink::PaymentItem& input)
     {
         PaymentItemPtr output = PaymentItem::New();
-        output->id = input.id();
         output->label = input.label();
         output->amount = CurrencyAmount::From(input.amount());
         return output;
     }
 };
 
 template <>
 struct TypeConverter<ShippingOptionPtr, blink::ShippingOption> {
     static ShippingOptionPtr Convert(const blink::ShippingOption& input)
     {
@@ skipping 28 matching lines @@
         return output;
     }
 };
 
 } // namespace mojo
 
 namespace blink {
 namespace {
 
 // Validates ShippingOption and PaymentItem dictionaries, which happen to have identical fields.
+// except for "id", which is present only in ShippingOption.
 template <typename T>
 void validateShippingOptionsOrPaymentItems(HeapVector<T> items, ExceptionState& exceptionState)
 {
     String errorMessage;
     for (const auto& item : items) {
-        if (!item.hasId() || item.id().isEmpty()) {
-            exceptionState.throwTypeError("Item id required");
-            return;
-        }
-
         if (!item.hasLabel() || item.label().isEmpty()) {
             exceptionState.throwTypeError("Item label required");
             return;
         }
 
         if (!item.hasAmount()) {
             exceptionState.throwTypeError("Currency amount required");
             return;
         }
 
@@ skipping 12 matching lines @@
             return;
         }
 
         if (!PaymentsValidators::isValidAmountFormat(item.amount().value(), &errorMessage)) {
             exceptionState.throwTypeError(errorMessage);
             return;
         }
     }
 }
 
+void validateShippingOptionsIds(HeapVector<ShippingOption> options, ExceptionState& exceptionState)
+{
+    for (const auto& option : options) {
+        if (!option.hasId() | option.id().isEmpty()) {

[please use gerrit instead, 2016/05/22 22:55:29]

| should be ||

[zino, 2016/05/23 01:42:30]

OMG! it's terrible mistake..

Done.

+            exceptionState.throwTypeError("ShippingOption id required");
+            return;
+        }
+    }
+}
+
 void validatePaymentDetails(const PaymentDetails& details, ExceptionState& exceptionState)
 {
     if (!details.hasItems()) {
         exceptionState.throwTypeError("Must specify items");
         return;
     }
 
     if (details.items().isEmpty()) {
         exceptionState.throwTypeError("Must specify at least one item");
         return;
     }
 
     validateShippingOptionsOrPaymentItems(details.items(), exceptionState);
     if (exceptionState.hadException())
         return;
 
-    if (details.hasShippingOptions())
+    if (details.hasShippingOptions()) {
         validateShippingOptionsOrPaymentItems(details.shippingOptions(), exceptionState);
+        validateShippingOptionsIds(details.shippingOptions(), exceptionState);
+    }
 }
 
 } // namespace
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, supportedMethods, details, PaymentOptions(), ScriptValue(), exceptionState);
 }
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, const PaymentOptions& options, ExceptionState& exceptionState)
@@ skipping 255 matching lines @@
 void PaymentRequest::clearResolversAndCloseMojoConnection()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink