[Payment] Clean up PaymentResponse::toJSONForBinding

third_party/WebKit/Source/modules/payments/PaymentResponse.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/PaymentResponse.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
 #include "modules/payments/PaymentAddress.h"
 #include "modules/payments/PaymentCompleter.h"
@@ skipping 23 matching lines @@
   V8ObjectBuilder result(scriptState);
   result.addString("methodName", methodName());
   result.add("details", details(scriptState, ASSERT_NO_EXCEPTION));
 
   if (shippingAddress())
     result.add("shippingAddress",
                shippingAddress()->toJSONForBinding(scriptState));
   else
     result.addNull("shippingAddress");
 
-  if (shippingOption().isNull())
-    result.addNull("shippingOption");
-  else
-    result.addString("shippingOption", shippingOption());
-
-  if (payerName().isNull())
-    result.addNull("payerName");
-  else
-    result.addString("payerName", payerName());
-
-  if (payerEmail().isNull())
-    result.addNull("payerEmail");
-  else
-    result.addString("payerEmail", payerEmail());
-
-  if (payerPhone().isNull())
-    result.addNull("payerPhone");
-  else
-    result.addString("payerPhone", payerPhone());
+  result.addStringOrNull("shippingOption", shippingOption())
+      .addStringOrNull("payerName", payerName())
+      .addStringOrNull("payerEmail", payerEmail())
+      .addStringOrNull("payerPhone", payerPhone());
 
   return result.scriptValue();
 }
 
 ScriptValue PaymentResponse::details(ScriptState* scriptState,
                                      ExceptionState& exceptionState) const {
   return ScriptValue(
       scriptState, fromJSONString(scriptState->isolate(), m_stringifiedDetails,
                                   exceptionState));
 }
 
 ScriptPromise PaymentResponse::complete(ScriptState* scriptState,
                                         const String& result) {
   PaymentCompleter::PaymentComplete convertedResult = PaymentCompleter::Unknown;
   if (result == "success")
     convertedResult = PaymentCompleter::Success;
   else if (result == "fail")
     convertedResult = PaymentCompleter::Fail;
   return m_paymentCompleter->complete(scriptState, convertedResult);
 }
 
 DEFINE_TRACE(PaymentResponse) {
   visitor->trace(m_shippingAddress);
   visitor->trace(m_paymentCompleter);
 }
 
 }  // namespace blink