PaymentHandler: Rename PaymentAppRequest with PaymentRequestEventData.

content/browser/payments/payment_app_browsertest.cc

 // Copyright 2017 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/payments/mojom/payment_app.mojom.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/payment_app_provider.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
-using ::payments::mojom::PaymentAppRequest;
-using ::payments::mojom::PaymentAppRequestPtr;
+using ::payments::mojom::PaymentRequestEventData;
+using ::payments::mojom::PaymentRequestEventDataPtr;
 using ::payments::mojom::PaymentAppResponsePtr;
 using ::payments::mojom::PaymentCurrencyAmount;
 using ::payments::mojom::PaymentDetailsModifier;
 using ::payments::mojom::PaymentDetailsModifierPtr;
 using ::payments::mojom::PaymentItem;
 using ::payments::mojom::PaymentMethodData;
 
 void GetAllPaymentAppsCallback(const base::Closure& done_callback,
                                PaymentAppProvider::PaymentApps* out_apps,
                                PaymentAppProvider::PaymentApps apps) {
@@ skipping 65 matching lines @@
       }
     }
 
     return registrationIds;
   }
 
   PaymentAppResponsePtr InvokePaymentAppWithTestData(
       int64_t registration_id,
       const std::string& supported_method,
       const std::string& instrument_key) {
-    PaymentAppRequestPtr app_request = PaymentAppRequest::New();
+    PaymentRequestEventDataPtr event_data = PaymentRequestEventData::New();
 
-    app_request->top_level_origin = GURL("https://example.com");
+    event_data->top_level_origin = GURL("https://example.com");
 
-    app_request->payment_request_origin = GURL("https://example.com");
+    event_data->payment_request_origin = GURL("https://example.com");
 
-    app_request->payment_request_id = "payment-request-id";
+    event_data->payment_request_id = "payment-request-id";
 
-    app_request->method_data.push_back(PaymentMethodData::New());
-    app_request->method_data[0]->supported_methods = {supported_method};
+    event_data->method_data.push_back(PaymentMethodData::New());
+    event_data->method_data[0]->supported_methods = {supported_method};
 
-    app_request->total = PaymentItem::New();
-    app_request->total->amount = PaymentCurrencyAmount::New();
-    app_request->total->amount->currency = "USD";
+    event_data->total = PaymentItem::New();
+    event_data->total->amount = PaymentCurrencyAmount::New();
+    event_data->total->amount->currency = "USD";
 
     PaymentDetailsModifierPtr modifier = PaymentDetailsModifier::New();
     modifier->total = PaymentItem::New();
     modifier->total->amount = PaymentCurrencyAmount::New();
     modifier->total->amount->currency = "USD";
     modifier->method_data = PaymentMethodData::New();
     modifier->method_data->supported_methods = {supported_method};
-    app_request->modifiers.push_back(std::move(modifier));
+    event_data->modifiers.push_back(std::move(modifier));
 
-    app_request->instrument_key = instrument_key;
+    event_data->instrument_key = instrument_key;
 
     base::RunLoop run_loop;
     PaymentAppResponsePtr response;
     PaymentAppProvider::GetInstance()->InvokePaymentApp(
         shell()->web_contents()->GetBrowserContext(), registration_id,
-        std::move(app_request),
+        std::move(event_data),
         base::Bind(&InvokePaymentAppCallback, run_loop.QuitClosure(),
                    &response));
     run_loop.Run();
 
     return response;
   }
 
   void ClearStoragePartitionData() {
     // Clear data from the storage partition. Parameters are set to clear data
     // for service workers, for all origins, for an unbounded time range.
@@ skipping 83 matching lines @@
       PopConsoleString() /* total */);
   EXPECT_EQ(
       "[{\"additionalDisplayItems\":[],\"supportedMethods\":[\"https://"
       "bobpay.com\"],"
       "\"total\":{\"amount\":{\"currency\":\"USD\",\"currencySystem\":\"urn:"
       "iso:std:iso:4217\",\"value\":\"\"},\"label\":\"\",\"pending\":false}}]",
       PopConsoleString() /* modifiers */);
   EXPECT_EQ("bobpay-payment-app-id", PopConsoleString() /* instrumentKey */);
 }
 }  // namespace content