[Payments] Return basic-card as the method name when possible.

components/payments/content/payment_request_spec_unittest.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 "components/payments/content/payment_request_spec.h"
 
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "components/payments/mojom/payment_request.mojom.h"
@@ skipping 50 matching lines @@
   entry2->supported_networks.push_back(mojom::BasicCardNetwork::UNIONPAY);
   entry2->supported_networks.push_back(mojom::BasicCardNetwork::JCB);
   entry2->supported_networks.push_back(mojom::BasicCardNetwork::VISA);
 
   std::vector<mojom::PaymentMethodDataPtr> method_data;
   method_data.push_back(std::move(entry));
   method_data.push_back(std::move(entry2));
 
   RecreateSpecWithMethodData(std::move(method_data));
 
-  // Only unionpay and jcb are supported through basic-card.
+  // unionpay and jcb are supported through basic-card. visa is supported
+  // through basic card because it was specified in basic-card in addition to
+  // supportedMethods.
   EXPECT_TRUE(spec()->IsMethodSupportedThroughBasicCard("unionpay"));
   EXPECT_TRUE(spec()->IsMethodSupportedThroughBasicCard("jcb"));
-  // "visa" is NOT supported through basic card because it was specified
-  // directly first in supportedMethods.
-  EXPECT_FALSE(spec()->IsMethodSupportedThroughBasicCard("visa"));
+  EXPECT_TRUE(spec()->IsMethodSupportedThroughBasicCard("visa"));
   EXPECT_FALSE(spec()->IsMethodSupportedThroughBasicCard("mastercard"));
   EXPECT_FALSE(spec()->IsMethodSupportedThroughBasicCard("diners"));
   EXPECT_FALSE(spec()->IsMethodSupportedThroughBasicCard("garbage"));
 }
 
 // Order matters when parsing the supportedMethods and basic card networks.
 TEST_F(PaymentRequestSpecTest,
        IsMethodSupportedThroughBasicCard_DifferentOrder) {
   mojom::PaymentMethodDataPtr entry = mojom::PaymentMethodData::New();
   entry->supported_methods.push_back("basic-card");
@@ skipping 206 matching lines @@
   new_option2->id = "option:2";
   new_option2->selected = true;
   new_shipping_options.push_back(std::move(new_option2));
   mojom::PaymentDetailsPtr new_details = mojom::PaymentDetails::New();
   new_details->shipping_options = std::move(new_shipping_options);
 
   spec()->UpdateWith(std::move(new_details));
 }
 
 }  // namespace payments