PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent.

third_party/WebKit/Source/modules/payments/PaymentAppRequestConversion.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/PaymentAppRequestConversion.h"
 
 #include "bindings/core/v8/ToV8ForCore.h"
 #include "modules/payments/PaymentAppRequest.h"
 #include "modules/payments/PaymentCurrencyAmount.h"
 #include "modules/payments/PaymentDetailsModifier.h"
@@ skipping 76 matching lines @@
     ScriptState* script_state,
     const WebPaymentAppRequest& web_app_request) {
   DCHECK(script_state);
 
   PaymentAppRequest app_request;
   if (!script_state->ContextIsValid())
     return app_request;
 
   ScriptState::Scope scope(script_state);
 
-  app_request.setOrigin(web_app_request.origin);
+  app_request.setTopLevelOrigin(web_app_request.top_level_origin);
+  app_request.setPaymentRequestOrigin(web_app_request.payment_request_origin);
+  app_request.setPaymentRequestId(web_app_request.payment_request_id);
   HeapVector<PaymentMethodData> method_data;
   for (const auto& md : web_app_request.method_data) {
     method_data.push_back(ToPaymentMethodData(script_state, md));
   }
   app_request.setMethodData(method_data);
   app_request.setTotal(ToPaymentItem(web_app_request.total));
   HeapVector<PaymentDetailsModifier> modifiers;
   for (const auto& modifier : web_app_request.modifiers) {
     modifiers.push_back(ToPaymentDetailsModifier(script_state, modifier));
   }
-  app_request.setOptionId(web_app_request.option_id);
+  app_request.setModifiers(modifiers);
+  app_request.setInstrumentKey(web_app_request.instrument_key);
   return app_request;
 }
 
 }  // namespace blink