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

label field was changed to name field in PaymentAppOption.idl and PaymentAppManifest.idl and also required keyword was added. spec list: https://w3c.github.io/webpayments-payment-apps-api/#payment-app-options https://w3c.github.io/webpayments-payment-apps-api/#payment-app-manifest w3c/payment-handler#70 BUG=661608 Review-Url: https://codereview.chromium.org/2562873002 Cr-Commit-Position: refs/heads/master@{#439192}
mirror · Dec 16, 2016 · e86e8cd · e86e8cd
1 parent 2776787
commit e86e8cd
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 30 deletions.
diff --git a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
@@ -32,14 +32,14 @@ static ScopedJavaLocalRef<jobject> GetAllAppManifests(
  ScopedJavaLocalRef<jobject> java_manifest =
  Java_ServiceWorkerPaymentAppBridge_createAndAddManifest(
  env, java_manifests, ConvertUTF8ToJavaString(env, scope_url),
- ConvertUTF8ToJavaString(env, manifest->label),
+ ConvertUTF8ToJavaString(env, manifest->name),
  manifest->icon ? ConvertUTF8ToJavaString(env, *manifest->icon)
  : nullptr);
  for (const auto& option : manifest->options) {
  ScopedJavaLocalRef<jobject> java_option =
  Java_ServiceWorkerPaymentAppBridge_createAndAddOption(
  env, java_manifest, ConvertUTF8ToJavaString(env, option->id),
- ConvertUTF8ToJavaString(env, option->label),
+ ConvertUTF8ToJavaString(env, option->name),
  option->icon ? ConvertUTF8ToJavaString(env, *option->icon)
  : nullptr);
  for (const auto& enabled_method : option->enabled_methods) {

diff --git a/components/payments/payment_app.mojom b/components/payments/payment_app.mojom
@@ -12,14 +12,14 @@ enum PaymentAppManifestError {
 };
 
 struct PaymentAppOption {
- string label;
+ string name;
  string? icon;
  string id;
  array<string> enabled_methods;
 };
 
 struct PaymentAppManifest {
- string label;
+ string name;
  string? icon;
  array<PaymentAppOption> options;
 };

diff --git a/content/browser/payments/payment_app.proto b/content/browser/payments/payment_app.proto
@@ -9,14 +9,14 @@ option optimize_for = LITE_RUNTIME;
 package content;
 
 message PaymentAppManifestProto {
- required string label = 1;
+ optional string name = 1;
  optional string icon = 2;
  repeated PaymentAppOptionProto options = 3;
 }
 
 message PaymentAppOptionProto {
- required string label = 1;
+ optional string name = 1;
  optional string icon = 2;
- required string id = 3;
+ optional string id = 3;
  repeated string enabled_methods = 4;
 }
diff --git a/content/browser/payments/payment_app_database.cc b/content/browser/payments/payment_app_database.cc
@@ -64,13 +64,13 @@ void PaymentAppDatabase::DidFindRegistrationToWriteManifest(
  }
 
  PaymentAppManifestProto manifest_proto;
- manifest_proto.set_label(manifest->label);
+ manifest_proto.set_name(manifest->name);
  if (manifest->icon)
  manifest_proto.set_icon(manifest->icon.value());
 
  for (const auto& option : manifest->options) {
  PaymentAppOptionProto* option_proto = manifest_proto.add_options();
- option_proto->set_label(option->label);
+ option_proto->set_name(option->name);
  if (option->icon)
  option_proto->set_icon(option->icon.value());
  option_proto->set_id(option->id);
@@ -138,13 +138,13 @@ void PaymentAppDatabase::DidReadManifest(const ReadManifestCallback& callback,
 
  payments::mojom::PaymentAppManifestPtr manifest =
  payments::mojom::PaymentAppManifest::New();
- manifest->label = manifest_proto.label();
+ manifest->name = manifest_proto.name();
  if (manifest_proto.has_icon())
  manifest->icon = manifest_proto.icon();
  for (const auto& option_proto : manifest_proto.options()) {
  payments::mojom::PaymentAppOptionPtr option =
  payments::mojom::PaymentAppOption::New();
- option->label = option_proto.label();
+ option->name = option_proto.name();
  if (option_proto.has_icon())
  option->icon = option_proto.icon();
  option->id = option_proto.id();

diff --git a/content/browser/payments/payment_app_manager_unittest.cc b/content/browser/payments/payment_app_manager_unittest.cc
@@ -59,15 +59,15 @@ void GetManifestCallback(bool* called,
 payments::mojom::PaymentAppManifestPtr CreatePaymentAppManifestForTest() {
  payments::mojom::PaymentAppOptionPtr option =
  payments::mojom::PaymentAppOption::New();
- option->label = "Visa ****";
+ option->name = "Visa ****";
  option->id = "payment-app-id";
  option->icon = std::string("payment-app-icon");
  option->enabled_methods.push_back("visa");
 
  payments::mojom::PaymentAppManifestPtr manifest =
  payments::mojom::PaymentAppManifest::New();
  manifest->icon = std::string("payment-app-icon");
- manifest->label = "Payment App";
+ manifest->name = "Payment App";
  manifest->options.push_back(std::move(option));
 
  return manifest;
@@ -160,10 +160,10 @@ TEST_F(PaymentAppManagerTest, SetAndGetManifest) {
  ASSERT_TRUE(called);
  ASSERT_EQ(read_error, payments::mojom::PaymentAppManifestError::NONE);
  EXPECT_EQ(read_manifest->icon, std::string("payment-app-icon"));
- EXPECT_EQ(read_manifest->label, "Payment App");
+ EXPECT_EQ(read_manifest->name, "Payment App");
  ASSERT_EQ(read_manifest->options.size(), 1U);
  EXPECT_EQ(read_manifest->options[0]->icon, std::string("payment-app-icon"));
- EXPECT_EQ(read_manifest->options[0]->label, "Visa ****");
+ EXPECT_EQ(read_manifest->options[0]->name, "Visa ****");
  EXPECT_EQ(read_manifest->options[0]->id, "payment-app-id");
  ASSERT_EQ(read_manifest->options[0]->enabled_methods.size(), 1U);
  EXPECT_EQ(read_manifest->options[0]->enabled_methods[0], "visa");

diff --git a/third_party/WebKit/LayoutTests/http/tests/payments/payment-app-manager.html b/third_party/WebKit/LayoutTests/http/tests/payments/payment-app-manager.html
@@ -17,7 +17,14 @@
  .then(state => {
  assert_equals(state, 'activated');
  return registration.paymentAppManager.setManifest({
- label: 'Payment App'
+ name: 'Payment App',
+ icon: 'payment-app-icon',
+ options: [{
+ name: 'Visa ****',
+ icon: 'payment-app-icon',
+ id: 'payment-app-id',
+ enabledMethods: ['visa']
+ }]
  });
  })
  .then(result => {
@@ -40,7 +47,14 @@
  .then(state => {
  assert_equals(state, 'installed');
  return registration.paymentAppManager.setManifest({
- label: 'Payment App'
+ name: 'Payment App',
+ icon: 'payment-app-icon',
+ options: [{
+ name: 'Visa ****',
+ icon: 'payment-app-icon',
+ id: 'payment-app-id',
+ enabledMethods: ['visa']
+ }]
  });
  })
  .then(result => {
@@ -67,7 +81,14 @@
  assert_equals(registration.waiting, null);
  assert_equals(registration.active, null);
  return registration.paymentAppManager.setManifest({
- label: 'Payment App'
+ name: 'Payment App',
+ icon: 'payment-app-icon',
+ options: [{
+ name: 'Visa ****',
+ icon: 'payment-app-icon',
+ id: 'payment-app-id',
+ enabledMethods: ['visa']
+ }]
  });
  })
  .then(unreached_fulfillment(test))
@@ -82,10 +103,10 @@
  var script_url = 'resources/empty-worker.js';
  var scope = 'resources/';
  var manifest = {
- label: 'Payment App',
+ name: 'Payment App',
  icon: 'payment-app-icon',
  options: [{
- label: 'Visa ****',
+ name: 'Visa ****',
  icon: 'payment-app-icon',
  id: 'payment-app-id',
  enabledMethods: ['visa2']
@@ -116,10 +137,10 @@
  var script_url = 'resources/empty-worker.js';
  var scope = 'resources/';
  var manifest = {
- label: 'Payment App',
+ name: 'Payment App',
  icon: 'payment-app-icon',
  options: [{
- label: 'Visa ****',
+ name: 'Visa ****',
  icon: 'payment-app-icon',
  id: 'payment-app-id',
  enabledMethods: ['visa2']

diff --git a/third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp b/third_party/WebKit/Source/modules/payments/PaymentAppManager.cpp
@@ -25,7 +25,7 @@ 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());
@@ -37,7 +37,7 @@ 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) {
@@ -52,7 +52,7 @@ 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) {
@@ -67,7 +67,7 @@ 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;

diff --git a/third_party/WebKit/Source/modules/payments/PaymentAppManifest.idl b/third_party/WebKit/Source/modules/payments/PaymentAppManifest.idl
@@ -5,7 +5,7 @@
 // https://w3c.github.io/webpayments-payment-apps-api/#idl-def-paymentappmanifest
 
 dictionary PaymentAppManifest {
- DOMString label;
+ required DOMString name;
  DOMString? icon;
- sequence<PaymentAppOption> options;
+ required sequence<PaymentAppOption> options;
 };
diff --git a/third_party/WebKit/Source/modules/payments/PaymentAppOption.idl b/third_party/WebKit/Source/modules/payments/PaymentAppOption.idl
@@ -5,8 +5,8 @@
 // https://w3c.github.io/webpayments-payment-apps-api/#idl-def-paymentappoption
 
 dictionary PaymentAppOption {
- DOMString label;
+ required DOMString name;
  DOMString? icon;
- DOMString id;
+ required DOMString id;
  sequence<DOMString> enabledMethods;
 };