Warn web developers that card networks as method names are deprecated.

third_party/WebKit/Source/modules/payments/PaymentRequest.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/PaymentRequest.h"
 
 #include <stddef.h>
 #include <utility>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 110 matching lines @@
 
     return output;
   }
 };
 
 }  // namespace mojo
 
 namespace blink {
 namespace {
 
+using ::payments::mojom::blink::BasicCardNetwork;
+
+const struct {
+  const BasicCardNetwork code;
+  const char* const name;
+} kBasicCardNetworks[] = {{BasicCardNetwork::AMEX, "amex"},
+                          {BasicCardNetwork::DINERS, "diners"},
+                          {BasicCardNetwork::DISCOVER, "discover"},
+                          {BasicCardNetwork::JCB, "jcb"},
+                          {BasicCardNetwork::MASTERCARD, "mastercard"},
+                          {BasicCardNetwork::MIR, "mir"},
+                          {BasicCardNetwork::UNIONPAY, "unionpay"},
+                          {BasicCardNetwork::VISA, "visa"}};
+
 // If the website does not call complete() 60 seconds after show() has been
 // resolved, then behave as if the website called complete("fail").
 static const int kCompleteTimeoutSeconds = 60;
 
 // Validates ShippingOption or PaymentItem, which happen to have identical
 // fields, except for "id", which is present only in ShippingOption.
 template <typename T>
 void ValidateShippingOptionOrPaymentItem(const T& item,
                                          const String& item_name,
                                          ExecutionContext& execution_context,
@@ skipping 201 matching lines @@
                             PaymentMethodDataPtr& output,
                             ExecutionContext& execution_context,
                             ExceptionState& exception_state) {
   BasicCardRequest basic_card;
   V8BasicCardRequest::toImpl(input.GetIsolate(), input.V8Value(), basic_card,
                              exception_state);
   if (exception_state.HadException())
     return;
 
   if (basic_card.hasSupportedNetworks()) {
-    using ::payments::mojom::blink::BasicCardNetwork;
-
-    const struct {
-      const BasicCardNetwork code;
-      const char* const name;
-    } kBasicCardNetworks[] = {{BasicCardNetwork::AMEX, "amex"},
-                              {BasicCardNetwork::DINERS, "diners"},
-                              {BasicCardNetwork::DISCOVER, "discover"},
-                              {BasicCardNetwork::JCB, "jcb"},
-                              {BasicCardNetwork::MASTERCARD, "mastercard"},
-                              {BasicCardNetwork::MIR, "mir"},
-                              {BasicCardNetwork::UNIONPAY, "unionpay"},
-                              {BasicCardNetwork::VISA, "visa"}};
-
     for (const String& network : basic_card.supportedNetworks()) {
       for (size_t i = 0; i < arraysize(kBasicCardNetworks); ++i) {
         if (network == kBasicCardNetworks[i].name) {
           output->supported_networks.push_back(kBasicCardNetworks[i].code);
           break;
         }
       }
     }
   }
 
@@ skipping 17 matching lines @@
     }
 
     if (output->supported_types.size() != arraysize(kBasicCardTypes)) {
       execution_context.AddConsoleMessage(ConsoleMessage::Create(
           kJSMessageSource, kWarningMessageLevel,
           "Cannot yet distinguish credit, debit, and prepaid cards."));
     }
   }
 }
 
+void WarnDeprecatedBasicCard(const Vector<String>& supported_methods,
+                             ExecutionContext& execution_context) {
+  for (const auto& method : supported_methods) {
+    for (size_t i = 0; i < arraysize(kBasicCardNetworks); ++i) {
+      if (method == kBasicCardNetworks[i].name) {
+        execution_context.AddConsoleMessage(ConsoleMessage::Create(
+            kJSMessageSource, kWarningMessageLevel,

[Rick Byers, 2017/05/16 13:48:58]

Please use the "DeprecationMessageSource" - that'll get picked up eg. by
lighthouse.  Can you use the common deprecation infrastructure in
Deprecation.cpp instead of rolling it yourself?

[please use gerrit instead, 2017/05/16 18:02:55]

Done.

+            "The supported methods 'amex', 'diners', 'discover', 'jcb', "
+            "'mastercard', 'mir', 'unionpay', and 'visa' are deprecated. Use "
+            "'basic-card' instead."));

[Rick Byers, 2017/05/16 13:48:58]

In general we prefer to give developers a concrete planned removal milestone and
chromestatus.com link for more context.

[please use gerrit instead, 2017/05/16 18:02:55]

Done.

+        return;
+      }
+    }
+  }
+}
+
 void StringifyAndParseMethodSpecificData(
     const Vector<String>& supported_methods,
     const ScriptValue& input,
     PaymentMethodDataPtr& output,
     ExecutionContext& execution_context,
     ExceptionState& exception_state) {
   DCHECK(!input.IsEmpty());
   v8::Local<v8::String> value;
   if (!input.V8Value()->IsObject() ||
       !v8::JSON::Stringify(input.GetContext(), input.V8Value().As<v8::Object>())
@@ skipping 14 matching lines @@
     SetAndroidPayMethodData(input, output, exception_state);
     if (exception_state.HadException())
       exception_state.ClearException();
   }
   if (RuntimeEnabledFeatures::paymentRequestBasicCardEnabled() &&
       supported_methods.Contains("basic-card")) {
     SetBasicCardMethodData(input, output, execution_context, exception_state);
     if (exception_state.HadException())
       exception_state.ClearException();
   }
+  WarnDeprecatedBasicCard(supported_methods, execution_context);
 }
 
 void ValidateAndConvertPaymentDetailsModifiers(
     const HeapVector<PaymentDetailsModifier>& input,
     Vector<PaymentDetailsModifierPtr>& output,
     ExecutionContext& execution_context,
     ExceptionState& exception_state) {
   for (const PaymentDetailsModifier& modifier : input) {
     output.push_back(payments::mojom::blink::PaymentDetailsModifier::New());
     if (modifier.hasTotal()) {
@@ skipping 622 matching lines @@
   complete_resolver_.Clear();
   show_resolver_.Clear();
   abort_resolver_.Clear();
   can_make_payment_resolver_.Clear();
   if (client_binding_.is_bound())
     client_binding_.Close();
   payment_provider_.reset();
 }
 
 }  // namespace blink