[PaymentApp] label field was changed to name field in PaymentAppOption.

third_party/WebKit/Source/modules/payments/PaymentAppManager.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/PaymentAppManager.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
 #include "modules/payments/PaymentAppManifest.h"
 #include "modules/payments/PaymentAppOption.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 
 namespace mojo {
 
 using payments::mojom::blink::PaymentAppManifest;
 using payments::mojom::blink::PaymentAppManifestPtr;
 using payments::mojom::blink::PaymentAppOption;
 using payments::mojom::blink::PaymentAppOptionPtr;
 
 template <>
 struct TypeConverter<PaymentAppOptionPtr, blink::PaymentAppOption> {
   static PaymentAppOptionPtr Convert(const blink::PaymentAppOption& input) {
     PaymentAppOptionPtr output = PaymentAppOption::New();
-    output->label = input.hasLabel() ? input.label() : WTF::emptyString();
+    output->name = input.hasName() ? input.name() : WTF::emptyString();
     output->icon = input.hasIcon() ? input.icon() : WTF::String();
     output->id = input.hasId() ? input.id() : WTF::emptyString();
     output->enabled_methods = WTF::Vector<WTF::String>(input.enabledMethods());
     return output;
   }
 };
 
 template <>
 struct TypeConverter<PaymentAppManifestPtr, blink::PaymentAppManifest> {
   static PaymentAppManifestPtr Convert(const blink::PaymentAppManifest& input) {
     PaymentAppManifestPtr output = PaymentAppManifest::New();
-    output->label = input.hasLabel() ? input.label() : WTF::emptyString();
+    output->name = input.hasName() ? input.name() : WTF::emptyString();
     output->icon = input.hasIcon() ? input.icon() : WTF::String();
     if (input.hasOptions()) {
       for (size_t i = 0; i < input.options().size(); ++i) {
         output->options.append(PaymentAppOption::From(input.options()[i]));
       }
     }
     return output;
   }
 };
 
 template <>
 struct TypeConverter<blink::PaymentAppManifest, PaymentAppManifestPtr> {
   static blink::PaymentAppManifest Convert(const PaymentAppManifestPtr& input) {
     blink::PaymentAppManifest output;
-    output.setLabel(input->label);
+    output.setName(input->name);
     output.setIcon(input->icon);
     blink::HeapVector<blink::PaymentAppOption> options;
     for (const auto& option : input->options) {
       options.append(mojo::ConvertTo<blink::PaymentAppOption>(option));
     }
     output.setOptions(options);
     return output;
   }
 };
 
 template <>
 struct TypeConverter<blink::PaymentAppOption, PaymentAppOptionPtr> {
   static blink::PaymentAppOption Convert(const PaymentAppOptionPtr& input) {
     blink::PaymentAppOption output;
-    output.setLabel(input->label);
+    output.setName(input->name);
     output.setIcon(input->icon);
     output.setId(input->id);
     Vector<WTF::String> enabledMethods;
     for (const auto& method : input->enabled_methods) {
       enabledMethods.append(method);
     }
     output.setEnabledMethods(enabledMethods);
     return output;
   }
 };
@@ skipping 111 matching lines @@
 
 void PaymentAppManager::onServiceConnectionError() {
   if (!Platform::current()) {
     return;
   }
 
   m_manager.reset();
 }
 
 }  // namespace blink