PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent.

content/renderer/service_worker/service_worker_type_converters.cc

 // Copyright 2015 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 "content/renderer/service_worker/service_worker_type_converters.h"
 
 #include "base/logging.h"
 
 namespace mojo {
 
@@ skipping 17 matching lines @@
   }
   return status_code;
 }
 
 blink::WebPaymentAppRequest
 TypeConverter<blink::WebPaymentAppRequest,
               payments::mojom::PaymentAppRequestPtr>::
     Convert(const payments::mojom::PaymentAppRequestPtr& input) {
   blink::WebPaymentAppRequest output;
 
-  output.origin = blink::WebString::FromUTF8(input->origin.spec());
+  output.top_level_origin =
+      blink::WebString::FromUTF8(input->top_level_origin.spec());
+  output.payment_request_origin =
+      blink::WebString::FromUTF8(input->payment_request_origin.spec());
+  output.payment_request_id =
+      blink::WebString::FromUTF8(input->payment_request_id);
 
   output.method_data =
       blink::WebVector<blink::WebPaymentMethodData>(input->method_data.size());
   for (size_t i = 0; i < input->method_data.size(); i++) {
     output.method_data[i] = mojo::ConvertTo<blink::WebPaymentMethodData>(
         std::move(input->method_data[i]));
   }
 
   output.total = mojo::ConvertTo<blink::WebPaymentItem>(input->total);
 
   output.modifiers = blink::WebVector<blink::WebPaymentDetailsModifier>(
       input->modifiers.size());
   for (size_t i = 0; i < input->modifiers.size(); i++) {
     output.modifiers[i] =
         mojo::ConvertTo<blink::WebPaymentDetailsModifier>(input->modifiers[i]);
   }
 
-  output.option_id = blink::WebString::FromUTF8(input->option_id);
+  output.instrument_key = blink::WebString::FromUTF8(input->instrument_key);
 
   return output;
 }
 
 blink::WebPaymentMethodData
 TypeConverter<blink::WebPaymentMethodData,
               payments::mojom::PaymentMethodDataPtr>::
     Convert(const payments::mojom::PaymentMethodDataPtr& input) {
   blink::WebPaymentMethodData output;
 
@@ skipping 72 matching lines @@
           kSucceeded;
     case content::mojom::BackgroundFetchState::FAILED:
       return blink::WebServiceWorkerContextProxy::BackgroundFetchState::kFailed;
   }
 
   NOTREACHED();
   return blink::WebServiceWorkerContextProxy::BackgroundFetchState::kPending;
 }
 
 }  // namespace mojo