[Payments] Present web payment app instead of instruments to user

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 "content/browser/storage_partition_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/payment_app_provider.h"
@@ skipping 66 matching lines @@
     EXPECT_TRUE(RunScript("resultQueue.pop()", &script_result));
     return script_result;
   }
 
   void RegisterPaymentApp() {
     std::string script_result;
     ASSERT_TRUE(RunScript("registerPaymentApp()", &script_result));
     ASSERT_EQ("registered", script_result);
   }
 
-  std::map<std::string, int64_t> GetAllPaymentInstrumentRegistrationIDs() {
+  std::vector<int64_t> GetAllPaymentAppRegistrationIDs() {
     base::RunLoop run_loop;
     PaymentAppProvider::PaymentApps apps;
     PaymentAppProvider::GetInstance()->GetAllPaymentApps(
         shell()->web_contents()->GetBrowserContext(),
         base::BindOnce(&GetAllPaymentAppsCallback, run_loop.QuitClosure(),
                        &apps));
     run_loop.Run();
 
-    std::map<std::string, int64_t> registrationIds;
+    std::vector<int64_t> registrationIds;
     for (const auto& app_info : apps) {
-      for (const auto& instrument : app_info.second->instruments) {
-        registrationIds.insert(std::pair<std::string, int64_t>(
-            instrument->instrument_key, app_info.second->registration_id));
-      }
+      registrationIds.push_back(app_info.second->registration_id);
     }
 
     return registrationIds;
   }
 
   PaymentAppResponsePtr InvokePaymentAppWithTestData(
       int64_t registration_id,
       const std::string& supported_method,
       const std::string& instrument_key) {
     PaymentRequestEventDataPtr event_data = PaymentRequestEventData::New();
@@ skipping 51 matching lines @@
 
  private:
   std::unique_ptr<net::EmbeddedTestServer> https_server_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentAppBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PaymentAppBrowserTest, PaymentAppInvocation) {
   RegisterPaymentApp();
 
-  std::map<std::string, int64_t> registrationIds =
-      GetAllPaymentInstrumentRegistrationIDs();
-  ASSERT_EQ(2U, registrationIds.size());
+  std::vector<int64_t> registrationIds = GetAllPaymentAppRegistrationIDs();
+  ASSERT_EQ(1U, registrationIds.size());
 
   PaymentAppResponsePtr response(InvokePaymentAppWithTestData(
-      registrationIds.at("basic-card-payment-app-id"), "basic-card",
-      "basic-card-payment-app-id"));
+      registrationIds[0], "basic-card", "basic-card-payment-app-id"));
   ASSERT_EQ("test", response->method_name);
 
   ClearStoragePartitionData();
 
-  registrationIds = GetAllPaymentInstrumentRegistrationIDs();
+  registrationIds = GetAllPaymentAppRegistrationIDs();
   ASSERT_EQ(0U, registrationIds.size());
 
   EXPECT_EQ("https://example.com/", PopConsoleString() /* topLevelOrigin */);
   EXPECT_EQ("https://example.com/",
             PopConsoleString() /* paymentRequestOrigin */);
   EXPECT_EQ("payment-request-id", PopConsoleString() /* paymentRequestId */);
   EXPECT_EQ("[{\"supportedMethods\":[\"basic-card\"]}]",
             PopConsoleString() /* methodData */);
   EXPECT_EQ(
       "{\"amount\":{\"currency\":\"USD\",\"currencySystem\":\"urn:iso:std:iso:"
       "4217\",\"value\":\"\"},\"label\":\"\",\"pending\":false}",
       PopConsoleString() /* total */);
   EXPECT_EQ(
       "[{\"additionalDisplayItems\":[],\"supportedMethods\":[\"basic-card\"],"
       "\"total\":{\"amount\":{\"currency\":\"USD\",\"currencySystem\":\"urn:"
       "iso:std:iso:4217\",\"value\":\"\"},\"label\":\"\",\"pending\":false}}]",
       PopConsoleString() /* modifiers */);
   EXPECT_EQ("basic-card-payment-app-id",
             PopConsoleString() /* instrumentKey */);
 }
 
 IN_PROC_BROWSER_TEST_F(PaymentAppBrowserTest, PaymentAppOpenWindowFailed) {
   RegisterPaymentApp();
 
-  std::map<std::string, int64_t> registrationIds =
-      GetAllPaymentInstrumentRegistrationIDs();
-  ASSERT_EQ(2U, registrationIds.size());
+  std::vector<int64_t> registrationIds = GetAllPaymentAppRegistrationIDs();
+  ASSERT_EQ(1U, registrationIds.size());
 
   PaymentAppResponsePtr response(InvokePaymentAppWithTestData(
-      registrationIds.at("bobpay-payment-app-id"), "https://bobpay.com",
-      "bobpay-payment-app-id"));
+      registrationIds[0], "https://bobpay.com", "bobpay-payment-app-id"));
   // InvokePaymentAppCallback returns empty method_name in case of failure, like
   // in PaymentRequestRespondWithObserver::OnResponseRejected.
   ASSERT_EQ("", response->method_name);
 
   ClearStoragePartitionData();
 
-  registrationIds = GetAllPaymentInstrumentRegistrationIDs();
+  registrationIds = GetAllPaymentAppRegistrationIDs();
   ASSERT_EQ(0U, registrationIds.size());
 
   EXPECT_EQ("https://example.com/", PopConsoleString() /* topLevelOrigin */);
   EXPECT_EQ("https://example.com/",
             PopConsoleString() /* paymentRequestOrigin */);
   EXPECT_EQ("payment-request-id", PopConsoleString() /* paymentRequestId */);
   EXPECT_EQ("[{\"supportedMethods\":[\"https://bobpay.com\"]}]",
             PopConsoleString() /* methodData */);
   EXPECT_EQ(
       "{\"amount\":{\"currency\":\"USD\",\"currencySystem\":\"urn:iso:std:iso:"
       "4217\",\"value\":\"\"},\"label\":\"\",\"pending\":false}",
       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