Reland "PaymentRequest: Introduce PaymentDetailsInit and PaymentDetailsUpdate."

components/payments/content/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/content/payment_details_validation.h"
 
 #include <set>
 #include <vector>
 
 #include "components/payments/content/payment_request.mojom.h"
@@ skipping 22 matching lines @@
   if (item->amount->currency.empty()) {
     *error_message = "Currency code required";
     return false;
   }
 
   if (item->amount->value.empty()) {
     *error_message = "Currency value required";
     return false;
   }
 
-  if (item->amount->currency != total->amount->currency) {
+  if (total && item->amount->currency != total->amount->currency) {
     *error_message = "Currencies must all be equal";
     return false;
   }
 
   if (item->amount->currency_system.empty()) {
     *error_message = "Currency system can't be empty";
     return false;
   }
 
   if (!payments::PaymentsValidators::isValidCurrencyCodeFormat(
@@ skipping 81 matching lines @@
       }
     }
   }
   return true;
 }
 
 }  // namespace
 
 bool validatePaymentDetails(const mojom::PaymentDetailsPtr& details,
                             std::string* error_message) {
-  if (details->total.is_null()) {
-    *error_message = "Must specify total";
-    return false;
-  }
+  if (details->total) {
+    if (!validateShippingOptionOrPaymentItem(details->total, details->total,
+                                             error_message))
+      return false;
 
-  if (!validateShippingOptionOrPaymentItem(details->total, details->total,
-                                           error_message))
-    return false;
-
-  if (details->total->amount->value[0] == '-') {
-    *error_message = "Total amount value should be non-negative";
-    return false;
+    if (details->total->amount->value[0] == '-') {
+      *error_message = "Total amount value should be non-negative";
+      return false;
+    }
   }
 
   if (details->display_items.size()) {
     if (!validateDisplayItems(details->display_items, details->total,
                               error_message))
       return false;
   }
 
   if (details->shipping_options.size()) {
     if (!validateShippingOptions(details->shipping_options, details->total,
                                  error_message))
       return false;
   }
 
   if (details->modifiers.size()) {
     if (!validatePaymentDetailsModifiers(details->modifiers, details->total,
                                          error_message))
       return false;
   }
   if (!PaymentsValidators::isValidErrorMsgFormat(details->error, error_message))
     return false;
   return true;
 }
 
 }  // namespace payments