[Payments] Implement web payment app manifest

chrome/browser/android/payments/service_worker_payment_app_bridge.cc

 // 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 "chrome/browser/android/payments/service_worker_payment_app_bridge.h"
 
 #include <utility>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 24 matching lines @@
 using ::payments::mojom::PaymentDetailsModifierPtr;
 using ::payments::mojom::PaymentItem;
 using ::payments::mojom::PaymentMethodData;
 using ::payments::mojom::PaymentMethodDataPtr;
 
 void OnGotAllPaymentApps(const JavaRef<jobject>& jweb_contents,
                          const JavaRef<jobject>& jcallback,
                          content::PaymentAppProvider::PaymentApps apps) {
   JNIEnv* env = AttachCurrentThread();
 
+  // TODO(gogerald): Present payment app instead of instruments to user,
+  // crbug.com/735063.
   for (const auto& app_info : apps) {
     ScopedJavaLocalRef<jobject> java_instruments =
         Java_ServiceWorkerPaymentAppBridge_createInstrumentList(env);
-    for (const auto& instrument : app_info.second) {
+    for (const auto& instrument : app_info.second->instruments) {
       Java_ServiceWorkerPaymentAppBridge_addInstrument(
-          env, java_instruments, jweb_contents, instrument->registration_id,
+          env, java_instruments, jweb_contents,
+          app_info.second->registration_id,
           ConvertUTF8ToJavaString(env, instrument->instrument_key),
           ConvertUTF8ToJavaString(env, instrument->name),
           ToJavaArrayOfStrings(env, instrument->enabled_methods),
           instrument->icon == nullptr
               ? nullptr
               : gfx::ConvertToJavaBitmap(instrument->icon.get()));
     }
     Java_ServiceWorkerPaymentAppBridge_onPaymentAppCreated(
         env, java_instruments, jweb_contents, jcallback);
   }
@@ skipping 124 matching lines @@
   content::PaymentAppProvider::GetInstance()->InvokePaymentApp(
       web_contents->GetBrowserContext(), registration_id, std::move(event_data),
       base::Bind(&OnPaymentAppInvoked,
                  ScopedJavaGlobalRef<jobject>(env, jweb_contents),
                  ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
 
 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }