Implement request id in PaymentDetailsInit

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index ca53cbcf63dd9f831990019556b106b7a20b6b33..14d89ae9f85dc173f714346947d15638b80efea7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -295,6 +295,7 @@ public class PaymentRequestImpl
      */
     private SectionInformation mUiShippingOptions;
 
+    private String mId;

[please use gerrit instead, 2017/03/27 16:22:36]

Make this final and move it to the block of final variables. For example, line
263.

[rwlbuis, 2017/03/27 20:45:29]

I dont think I can make it final.

     private Map<String, PaymentMethodData> mMethodData;
     private boolean mRequestShipping;
     private boolean mRequestPayerName;
@@ -759,6 +760,10 @@ public class PaymentRequestImpl
 
         updateInstrumentModifiedTotals();
 
+        if (details.id != null) {

[please use gerrit instead, 2017/03/27 16:22:36]

"id" can be set only in init(). It should not be set in updateWith(). Both of
those functions call into parseAndValidateDetailsOrDisconnectFromClient().
Therefore, this function is not the appropriate place for copying the "id".
Let's move the copying into init() instead.

If the response to https://github.com/w3c/browser-payment-api/issues/483 is
"generate `id` when it's empty or null," then init() should also check that
`details.id` is not null and not empty.

[rwlbuis, 2017/03/27 20:45:29]

Done.

+            mId = details.id;
+        }
+
         return true;
     }
 
@@ -1167,7 +1172,7 @@ public class PaymentRequestImpl
         PaymentOption selectedContact = mContactSection != null ? mContactSection.getSelectedItem()
                 : null;
         mPaymentResponseHelper = new PaymentResponseHelper(
-                selectedShippingAddress, selectedShippingOption, selectedContact, this);
+                mId, selectedShippingAddress, selectedShippingOption, selectedContact, this);

[please use gerrit instead, 2017/03/27 16:22:36]

No need to pass `mId` back into the renderer. The renderer process already has
the identifier, which is unchangeable after construction.

[rwlbuis, 2017/03/27 20:45:29]

Done.

 
         // Create maps that are subsets of mMethodData and mModifiers, that contain
         // the payment methods supported by the selected payment instrument. If the
@@ -1185,7 +1190,7 @@ public class PaymentRequestImpl
             }
         }
 
-        instrument.invokePaymentApp(mMerchantName, mSchemelessOriginForPaymentApp,
+        instrument.invokePaymentApp(mId, mMerchantName, mSchemelessOriginForPaymentApp,
                 mSchemelessIFrameOriginForPaymentApp, mCertificateChain,
                 Collections.unmodifiableMap(methodData), mRawTotal, mRawLineItems,
                 Collections.unmodifiableMap(modifiers), this);