Move payment_request.mojom file to components/

Currently, only Blink depends on payment_requet.mojom. Going
forward, all the platforms will, so moving it to a more generic
location.

BUG=

Review-Url: https://codereview.chromium.org/2406923002
Cr-Commit-Position: refs/heads/master@{#427077}

chrome/android/BUILD.gn

@@ -149,6 +149,7 @@ android_library("chrome_java") {
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//components/autofill/android:autofill_java",
     "//components/minidump_uploader:minidump_uploader_java",
+    "//components/payments:payment_request_java",
     "//components/safe_json/android:safe_json_java",
     "//components/spellcheck/browser/android:java",
     "//components/variations/android:variations_java",
@@ -313,6 +314,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/android/webapk/test:junit_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/invalidation/impl:java",
+    "//components/payments:payment_request_java",
     "//components/signin/core/browser/android:java",
     "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync:sync_java_test_support",
@@ -384,6 +386,7 @@ android_library("chrome_test_java") {
     "//components/location/android:location_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/navigation_interception/android:navigation_interception_java",
+    "//components/payments:payment_request_java",
     "//components/policy/android:policy_java",
     "//components/precache/android:precache_java",
     "//components/precache/android:precache_javatests",

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -66,7 +66,7 @@ import java.util.Set;
 
 /**
  * Android implementation of the PaymentRequest service defined in
- * third_party/WebKit/public/platform/modules/payments/payment_request.mojom.
+ * components/payments/payment_request.mojom.
  */
 public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Client,
         PaymentApp.InstrumentsCallback, PaymentInstrument.InstrumentDetailsCallback,

chrome/browser/chrome_content_browser_client.cc

@@ -131,6 +131,7 @@
 #include "components/metrics/client_info.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
+#include "components/payments/payment_request.mojom.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ -186,7 +187,6 @@
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "storage/browser/fileapi/external_mount_points.h"
-#include "third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h"
 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"

components/payments/BUILD.gn

+# 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.
+
+import("//mojo/public/tools/bindings/mojom.gni")
+
+mojom("payment_request") {
+  sources = [
+    "payment_request.mojom",
+  ]
+
+  public_deps = [
+    "//mojo/common:common_custom_types",
+  ]
+}

third_party/WebKit/public/platform/modules/payments/OWNERS → components/payments/OWNERS

+jdonnelly@chromium.org
+krb@chromium.org
 rouslan@chromium.org
 
 per-file *.mojom=set noparent

third_party/WebKit/Source/modules/BUILD.gn

@@ -290,6 +290,7 @@ source_set("unit_tests") {
   deps = [
     ":modules",
     ":modules_testing",
+    "//components/payments:payment_request_blink",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",

third_party/WebKit/Source/modules/payments/BUILD.gn

@@ -21,4 +21,7 @@ blink_modules_sources("payments") {
     "PaymentsValidators.cpp",
     "PaymentsValidators.h",
   ]
+  deps = [
+    "//components/payments:payment_request_blink",
+  ]
 }

third_party/WebKit/Source/modules/payments/DEPS

 include_rules = [
+    "+components/payments",
     "+mojo/public/cpp/bindings/binding.h",
     "+mojo/public/cpp/bindings/interface_request.h",
     "+mojo/public/cpp/bindings/wtf_array.h",

third_party/WebKit/Source/modules/payments/PaymentAddress.cpp

@@ -11,7 +11,7 @@ namespace blink {
 
 PaymentAddress::PaymentAddress(mojom::blink::PaymentAddressPtr address)
     : m_country(address->country),
-      m_addressLine(address->address_line.PassStorage()),
+      m_addressLine(address->address_line),
       m_region(address->region),
       m_city(address->city),
       m_dependentLocality(address->dependent_locality),

third_party/WebKit/Source/modules/payments/PaymentAddress.h

@@ -7,9 +7,9 @@
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "components/payments/payment_request.mojom-blink.h"
 #include "modules/ModulesExport.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/payments/payment_request.mojom-blink.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"

third_party/WebKit/Source/modules/payments/PaymentAddressTest.cpp

@@ -13,10 +13,9 @@ namespace {
 TEST(PaymentAddressTest, ValuesAreCopiedOver) {
   mojom::blink::PaymentAddressPtr input = mojom::blink::PaymentAddress::New();
   input->country = "US";
-  input->address_line = mojo::WTFArray<WTF::String>::New(3);
-  input->address_line[0] = "340 Main St";
-  input->address_line[1] = "BIN1";
-  input->address_line[2] = "First floor";
+  input->address_line.append("340 Main St");
+  input->address_line.append("BIN1");
+  input->address_line.append("First floor");
   input->region = "CA";
   input->city = "Los Angeles";
   input->dependent_locality = "Venice";

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

@@ -97,12 +97,12 @@ struct TypeConverter<PaymentDetailsModifierPtr, blink::PaymentDetailsModifier> {
     else
       output->total = PaymentItem::New();
 
-    if (input.hasAdditionalDisplayItems())
-      output->additional_display_items =
-          mojo::WTFArray<PaymentItemPtr>::From(input.additionalDisplayItems());
-    else
-      output->additional_display_items = mojo::WTFArray<PaymentItemPtr>::New(0);
-
+    if (input.hasAdditionalDisplayItems()) {
+      for (size_t i = 0; i < input.additionalDisplayItems().size(); ++i) {
+        output->additional_display_items.append(
+            PaymentItem::From(input.additionalDisplayItems()[i]));
+      }
+    }
     return output;
   }
 };
@@ -113,24 +113,26 @@ struct TypeConverter<PaymentDetailsPtr, blink::PaymentDetails> {
     PaymentDetailsPtr output = PaymentDetails::New();
     output->total = PaymentItem::From(input.total());
 
-    if (input.hasDisplayItems())
-      output->display_items =
-          mojo::WTFArray<PaymentItemPtr>::From(input.displayItems());
-    else
-      output->display_items = mojo::WTFArray<PaymentItemPtr>::New(0);
+    if (input.hasDisplayItems()) {
+      for (size_t i = 0; i < input.displayItems().size(); ++i) {
+        output->display_items.append(
+            PaymentItem::From(input.displayItems()[i]));
+      }
+    }
 
-    if (input.hasShippingOptions())
-      output->shipping_options = mojo::WTFArray<PaymentShippingOptionPtr>::From(
-          input.shippingOptions());
-    else
-      output->shipping_options =
-          mojo::WTFArray<PaymentShippingOptionPtr>::New(0);
+    if (input.hasShippingOptions()) {
+      for (size_t i = 0; i < input.shippingOptions().size(); ++i) {
+        output->shipping_options.append(
+            PaymentShippingOption::From(input.shippingOptions()[i]));
+      }
+    }
 
-    if (input.hasModifiers())
-      output->modifiers =
-          mojo::WTFArray<PaymentDetailsModifierPtr>::From(input.modifiers());
-    else
-      output->modifiers = mojo::WTFArray<PaymentDetailsModifierPtr>::New(0);
+    if (input.hasModifiers()) {
+      for (size_t i = 0; i < input.modifiers().size(); ++i) {
+        output->modifiers.append(
+            PaymentDetailsModifier::From(input.modifiers()[i]));
+      }
+    }
 
     if (input.hasError())
       output->error = input.error();
@@ -459,6 +461,19 @@ bool allowedToUsePaymentRequest(const Frame* frame) {
   return false;
 }
 
+WTF::Vector<mojom::blink::PaymentMethodDataPtr> ConvertPaymentMethodData(
+    const Vector<PaymentRequest::MethodData>& blinkMethods) {
+  WTF::Vector<mojom::blink::PaymentMethodDataPtr> mojoMethods(
+      blinkMethods.size());
+  for (size_t i = 0; i < blinkMethods.size(); ++i) {
+    mojoMethods[i] = mojom::blink::PaymentMethodData::New();
+    mojoMethods[i]->supported_methods =
+        WTF::Vector<WTF::String>(blinkMethods[i].supportedMethods);
+    mojoMethods[i]->stringified_data = blinkMethods[i].stringifiedData;
+  }
+  return mojoMethods;
+}
+
 }  // namespace
 
 PaymentRequest* PaymentRequest::create(
@@ -668,8 +683,7 @@ PaymentRequest::PaymentRequest(ScriptState* scriptState,
                 mojom::blink::PaymentErrorReason::UNKNOWN)));
   m_paymentProvider->Init(
       m_clientBinding.CreateInterfacePtrAndBind(),
-      mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(
-          validatedMethodData),
+      ConvertPaymentMethodData(validatedMethodData),
       maybeKeepShippingOptions(
           mojom::blink::PaymentDetails::From(details),
           keepShippingOptions && m_options.requestShipping()),

third_party/WebKit/Source/modules/payments/PaymentRequest.h

@@ -8,6 +8,7 @@
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "components/payments/payment_request.mojom-blink.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/events/EventTarget.h"
 #include "modules/ModulesExport.h"
@@ -19,7 +20,6 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/payments/payment_request.mojom-blink.h"
 #include "wtf/Compiler.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/RefPtr.h"

third_party/WebKit/Source/modules/payments/PaymentResponse.h

@@ -8,10 +8,10 @@
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "components/payments/payment_request.mojom-blink.h"
 #include "modules/ModulesExport.h"
 #include "modules/payments/PaymentCurrencyAmount.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/payments/payment_request.mojom-blink.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/text/WTFString.h"
 

third_party/WebKit/Source/modules/payments/PaymentResponseTest.cpp

@@ -129,10 +129,9 @@ TEST(PaymentResponseTest, JSONSerializerTest) {
   input->shipping_address->country = "US";
   input->shipping_address->language_code = "en";
   input->shipping_address->script_code = "Latn";
-  input->shipping_address->address_line = mojo::WTFArray<WTF::String>::New(3);
-  input->shipping_address->address_line[0] = "340 Main St";
-  input->shipping_address->address_line[1] = "BIN1";
-  input->shipping_address->address_line[2] = "First floor";
+  input->shipping_address->address_line.append("340 Main St");
+  input->shipping_address->address_line.append("BIN1");
+  input->shipping_address->address_line.append("First floor");
 
   PaymentResponse output(std::move(input), new MockPaymentCompleter);
   ScriptValue jsonObject = output.toJSONForBinding(scope.getScriptState());

third_party/WebKit/Source/modules/payments/PaymentTestHelper.h

@@ -7,12 +7,12 @@
 
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/V8DOMException.h"
+#include "components/payments/payment_request.mojom-blink.h"
 #include "modules/payments/PaymentDetails.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentShippingOption.h"
 #include "platform/heap/HeapAllocator.h"
 #include "platform/heap/Persistent.h"
-#include "public/platform/modules/payments/payment_request.mojom-blink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "wtf/Allocator.h"
 #include "wtf/Vector.h"

third_party/WebKit/Source/modules/payments/PaymentsValidators.cpp

@@ -5,6 +5,7 @@
 #include "modules/payments/PaymentsValidators.h"
 
 #include "bindings/core/v8/ScriptRegexp.h"
+#include "platform/weborigin/KURL.h"
 #include "wtf/text/StringImpl.h"
 
 namespace blink {

third_party/WebKit/Source/modules/payments/PaymentsValidators.h

@@ -5,8 +5,8 @@
 #ifndef PaymentsValidators_h
 #define PaymentsValidators_h
 
+#include "components/payments/payment_request.mojom-blink.h"
 #include "modules/ModulesExport.h"
-#include "public/platform/modules/payments/payment_request.mojom-blink.h"
 #include "wtf/Allocator.h"
 #include "wtf/text/WTFString.h"
 

third_party/WebKit/public/BUILD.gn

@@ -696,10 +696,10 @@ mojom("new_wrapper_types_mojo_bindings") {
 
 mojom("android_mojo_bindings") {
   sources = [
-    "platform/modules/payments/payment_request.mojom",
     "platform/modules/webshare/webshare.mojom",
   ]
   public_deps = [
+    "//components/payments:payment_request",
     "//url/mojo:url_mojom_gurl",
   ]