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

chrome/browser/autofill/android/personal_data_manager_android.cc

Index: chrome/browser/autofill/android/personal_data_manager_android.cc
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index f71b114e14e5a8bc69fe86b4feb2da772b05afc0..6cd7eda581cce6be3354e6f47d9a2f3bfe6f46df 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -492,18 +492,21 @@ void PersonalDataManagerAndroid::UpdateServerCardBillingAddress(
   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(