[Payments] Present web payment app instead of instruments to user

chrome/browser/android/payments/service_worker_payment_app_bridge.cc

Index: chrome/browser/android/payments/service_worker_payment_app_bridge.cc
diff --git a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
index 0c0057667825fc3f7b91e23090cbee09b5a9c1af..a0c87a3b2a8ed9375496cea02a303ddba2564211 100644
--- a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
+++ b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/payment_app_provider.h"
-#include "content/public/browser/stored_payment_instrument.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ServiceWorkerPaymentAppBridge_jni.h"
 #include "third_party/WebKit/public/platform/modules/payments/payment_app.mojom.h"
@@ -42,24 +41,15 @@ void OnGotAllPaymentApps(const JavaRef<jobject>& jweb_contents,
                          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->instruments) {
-      Java_ServiceWorkerPaymentAppBridge_addInstrument(
-          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);
+        env, app_info.second->registration_id,
+        ConvertUTF8ToJavaString(env, app_info.second->name),
+        app_info.second->icon == nullptr
+            ? nullptr
+            : gfx::ConvertToJavaBitmap(app_info.second->icon.get()),
+        ToJavaArrayOfStrings(env, app_info.second->enabled_methods),
+        jweb_contents, jcallback);
   }
   Java_ServiceWorkerPaymentAppBridge_onAllPaymentAppsCreated(env, jcallback);
 }
@@ -103,7 +93,6 @@ static void InvokePaymentApp(
     const JavaParamRef<jobjectArray>& jmethod_data,
     const JavaParamRef<jobject>& jtotal,
     const JavaParamRef<jobjectArray>& jmodifiers,
-    const JavaParamRef<jstring>& jinstrument_key,
     const JavaParamRef<jobject>& jcallback) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
@@ -183,8 +172,6 @@ static void InvokePaymentApp(
     event_data->modifiers.push_back(std::move(modifier));
   }
 
-  event_data->instrument_key = ConvertJavaStringToUTF8(env, jinstrument_key);
-
   content::PaymentAppProvider::GetInstance()->InvokePaymentApp(
       web_contents->GetBrowserContext(), registration_id, std::move(event_data),
       base::Bind(&OnPaymentAppInvoked,