Separate credit card scanner from native bridge.

chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc

Index: chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc
diff --git a/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc b/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc
index 14b5d82806c5c8bee42737017856f346273e31e7..3c3b8987eff371cc95aaa28ff09e796ee9756bf7 100644
--- a/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc
+++ b/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc
@@ -17,7 +17,7 @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "content/public/browser/android/content_view_core.h"
-#include "jni/CreditCardScanner_jni.h"
+#include "jni/CreditCardScannerBridge_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 
@@ -29,9 +29,9 @@ namespace autofill {
 bool CreditCardScannerView::CanShow() {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaGlobalRef<jobject> java_object(
-      Java_CreditCardScanner_create(
+      Java_CreditCardScannerBridge_create(
           env, 0, base::android::GetApplicationContext(), nullptr));
-  return Java_CreditCardScanner_canScan(env, java_object);
+  return Java_CreditCardScannerBridge_canScan(env, java_object);
 }
 
 // static
@@ -51,7 +51,7 @@ CreditCardScannerViewAndroid::CreditCardScannerViewAndroid(
     const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
     content::WebContents* web_contents)
     : delegate_(delegate),
-      java_object_(Java_CreditCardScanner_create(
+      java_object_(Java_CreditCardScannerBridge_create(
           base::android::AttachCurrentThread(),
           reinterpret_cast<intptr_t>(this),
           base::android::GetApplicationContext(),
@@ -79,19 +79,15 @@ void CreditCardScannerViewAndroid::ScanCompleted(
   card.SetNumber(base::android::ConvertJavaStringToUTF16(env, card_number));
   card.SetExpirationMonth(static_cast<int>(expiration_month));
   card.SetExpirationYear(static_cast<int>(expiration_year));
-
-  if (base::FeatureList::IsEnabled(kAutofillScanCardholderName)) {

[msw, 2016/08/26 22:37:07]

Where exactly is this checked now? I don't see it in your CL.

[please use gerrit instead, 2016/08/29 17:58:31]

I was going to rely on the implementation of the scanner to check the flag, but
I realize that's hard to review. Therefore, I've created a DelegateWrapper class
inside of the CreditCardScanner.java. The wrapper checks the flag to see whether
the cardHolderName needs to be cleared, regardless of what the implementation of
the scanner does.

[msw, 2016/08/29 18:19:19]

Can we just DCHECK that the cardholder name is blank here if the experiment is
not enabled or something similar? Adding another layer of indirection seems very
unfortunate to me. It seems more straightforward to leave this conditional here
(and/or DCHECK) than add a delegate wrapper.

[please use gerrit instead, 2016/08/29 18:50:49]

Done.

-    card.SetRawInfo(
-        CREDIT_CARD_NAME_FULL,
-        base::android::ConvertJavaStringToUTF16(env, card_holder_name));
-  }
-
+  card.SetRawInfo(
+      CREDIT_CARD_NAME_FULL,
+      base::android::ConvertJavaStringToUTF16(env, card_holder_name));
   delegate_->ScanCompleted(card);
 }
 
 void CreditCardScannerViewAndroid::Show() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_CreditCardScanner_scan(env, java_object_);
+  Java_CreditCardScannerBridge_scan(env, java_object_);
 }
 
 }  // namespace autofill