[Payments] Show the icon for the typed in credit card in editor

chrome/browser/autofill/android/personal_data_manager_android.cc

 // Copyright 2013 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/autofill/android/personal_data_manager_android.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ skipping 474 matching lines @@
     const JavaParamRef<jstring>& jcard_server_id,
     const JavaParamRef<jstring>& jbilling_address_id) {
   CreditCard card("", kSettingsOrigin);
   card.set_record_type(CreditCard::MASKED_SERVER_CARD);
   card.set_server_id(ConvertJavaStringToUTF8(env, jcard_server_id));
   card.set_billing_address_id(ConvertJavaStringToUTF8(env,
       jbilling_address_id));
   personal_data_manager_->UpdateServerCardBillingAddress(card);
 }
 
-ScopedJavaLocalRef<jstring>
-PersonalDataManagerAndroid::GetBasicCardPaymentTypeIfValid(
+ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::GetBasicCardPaymentType(
     JNIEnv* env,
     const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jcard_number) {
+    const JavaParamRef<jstring>& jcard_number,
+    const jboolean jempty_if_invalid) {
   base::string16 card_number = ConvertJavaStringToUTF16(env, jcard_number);
-  return ConvertUTF8ToJavaString(
-      env, IsValidCreditCardNumber(card_number)
-               ? data_util::GetPaymentRequestData(
-                     CreditCard::GetCreditCardType(card_number))
-                     .basic_card_payment_type
-               : "");
+
+  if (static_cast<bool>(jempty_if_invalid) &&
+      !IsValidCreditCardNumber(card_number)) {
+    return ConvertUTF8ToJavaString(env, "");
+  }
+  return ConvertUTF8ToJavaString(env,
+                                 data_util::GetPaymentRequestData(
+                                     CreditCard::GetCreditCardType(card_number))
+                                     .basic_card_payment_type);

[please use gerrit instead, 2016/10/25 17:48:18]

You can reduce the number of lines by 1 here. Up to you which style you prefer.

  return ConvertUTF8ToJavaString(
      env, static_cast<bool>(jempty_if_invalid) &&
                   !IsValidCreditCardNumber(card_number)
               ? ""
               : data_util::GetPaymentRequestData(
                     CreditCard::GetCreditCardType(card_number))
                     .basic_card_payment_type);

[gogerald1, 2016/10/26 15:22:16]

Acknowledged. Looks more readable by separating them.

 }
 
 void PersonalDataManagerAndroid::AddServerCreditCardForTest(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& unused_obj,
     const base::android::JavaParamRef<jobject>& jcard) {
   std::unique_ptr<CreditCard> card(new CreditCard);
   PopulateNativeCreditCardFromJava(jcard, env, card.get());
   card->set_record_type(CreditCard::MASKED_SERVER_CARD);
   personal_data_manager_->AddServerCreditCardForTest(std::move(card));
@@ skipping 315 matching lines @@
                base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill