Commit a384ba43 authored by Jared Saul's avatar Jared Saul Committed by Commit Bot

[Autofill] Remove AutofillScanCardholderName feature

It's dead code with no development, and Rouslan said to kill it with
fire. :)

Bug: 881343
Change-Id: I7c41130b4a1aa0e7a537e95a0b0e6aaac83aa591
Reviewed-on: https://chromium-review.googlesource.com/c/1300794Reviewed-by: default avatarSebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Jared Saul <jsaul@google.com>
Cr-Commit-Position: refs/heads/master@{#603230}
parent 86259392
...@@ -158,7 +158,6 @@ public abstract class ChromeFeatureList { ...@@ -158,7 +158,6 @@ public abstract class ChromeFeatureList {
public static final String AUTOFILL_ASSISTANT = "AutofillAssistant"; public static final String AUTOFILL_ASSISTANT = "AutofillAssistant";
public static final String AUTOFILL_REFRESH_STYLE_ANDROID = "AutofillRefreshStyleAndroid"; public static final String AUTOFILL_REFRESH_STYLE_ANDROID = "AutofillRefreshStyleAndroid";
public static final String AUTOFILL_KEYBOARD_ACCESSORY = "AutofillKeyboardAccessory"; public static final String AUTOFILL_KEYBOARD_ACCESSORY = "AutofillKeyboardAccessory";
public static final String AUTOFILL_SCAN_CARDHOLDER_NAME = "AutofillScanCardholderName";
public static final String CAF_MEDIA_ROUTER_IMPL = "CafMediaRouterImpl"; public static final String CAF_MEDIA_ROUTER_IMPL = "CafMediaRouterImpl";
public static final String CAPTIVE_PORTAL_CERTIFICATE_LIST = "CaptivePortalCertificateList"; public static final String CAPTIVE_PORTAL_CERTIFICATE_LIST = "CaptivePortalCertificateList";
public static final String CCT_BACKGROUND_TAB = "CCTBackgroundTab"; public static final String CCT_BACKGROUND_TAB = "CCTBackgroundTab";
......
...@@ -52,7 +52,6 @@ namespace { ...@@ -52,7 +52,6 @@ namespace {
const base::Feature* kFeaturesExposedToJava[] = { const base::Feature* kFeaturesExposedToJava[] = {
&autofill::features::kAutofillManualFallbackAndroid, &autofill::features::kAutofillManualFallbackAndroid,
&autofill::features::kAutofillRefreshStyleAndroid, &autofill::features::kAutofillRefreshStyleAndroid,
&autofill::features::kAutofillScanCardholderName,
&contextual_suggestions::kContextualSuggestionsAlternateCardLayout, &contextual_suggestions::kContextualSuggestionsAlternateCardLayout,
&contextual_suggestions::kContextualSuggestionsButton, &contextual_suggestions::kContextualSuggestionsButton,
&contextual_suggestions::kContextualSuggestionsIPHReverseScroll, &contextual_suggestions::kContextualSuggestionsIPHReverseScroll,
......
...@@ -8,13 +8,11 @@ ...@@ -8,13 +8,11 @@
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
#include "base/android/jni_string.h" #include "base/android/jni_string.h"
#include "base/feature_list.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "chrome/browser/ui/android/view_android_helper.h" #include "chrome/browser/ui/android/view_android_helper.h"
#include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h" #include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h"
#include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/credit_card.h"
#include "components/autofill/core/browser/field_types.h" #include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/common/autofill_features.h"
#include "jni/CreditCardScannerBridge_jni.h" #include "jni/CreditCardScannerBridge_jni.h"
#include "ui/android/view_android.h" #include "ui/android/view_android.h"
#include "ui/android/window_android.h" #include "ui/android/window_android.h"
...@@ -68,12 +66,6 @@ void CreditCardScannerViewAndroid::ScanCompleted( ...@@ -68,12 +66,6 @@ void CreditCardScannerViewAndroid::ScanCompleted(
card.SetExpirationMonth(static_cast<int>(expiration_month)); card.SetExpirationMonth(static_cast<int>(expiration_month));
card.SetExpirationYear(static_cast<int>(expiration_year)); card.SetExpirationYear(static_cast<int>(expiration_year));
base::string16 name =
base::android::ConvertJavaStringToUTF16(env, card_holder_name);
DCHECK(name.empty() ||
base::FeatureList::IsEnabled(features::kAutofillScanCardholderName));
card.SetRawInfo(CREDIT_CARD_NAME_FULL, name);
delegate_->ScanCompleted(card); delegate_->ScanCompleted(card);
} }
......
...@@ -211,11 +211,7 @@ bool AutofillManager::ShouldShowScanCreditCard(const FormData& form, ...@@ -211,11 +211,7 @@ bool AutofillManager::ShouldShowScanCreditCard(const FormData& form,
base::ContainsOnlyChars(CreditCard::StripSeparators(field.value), base::ContainsOnlyChars(CreditCard::StripSeparators(field.value),
base::ASCIIToUTF16("0123456789")); base::ASCIIToUTF16("0123456789"));
bool is_scannable_name_on_card_field = if (!is_card_number_field)
autofill_field->Type().GetStorableType() == CREDIT_CARD_NAME_FULL &&
base::FeatureList::IsEnabled(features::kAutofillScanCardholderName);
if (!is_card_number_field && !is_scannable_name_on_card_field)
return false; return false;
if (IsFormNonSecure(form)) if (IsFormNonSecure(form))
......
...@@ -176,9 +176,6 @@ const base::Feature kAutofillSaveCreditCardUsesStrikeSystem{ ...@@ -176,9 +176,6 @@ const base::Feature kAutofillSaveCreditCardUsesStrikeSystem{
"AutofillSaveCreditCardUsesStrikeSystem", "AutofillSaveCreditCardUsesStrikeSystem",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kAutofillScanCardholderName{
"AutofillScanCardholderName", base::FEATURE_DISABLED_BY_DEFAULT};
// Controls whether experiment ids should be sent through // Controls whether experiment ids should be sent through
// Google Payments RPCs or not. // Google Payments RPCs or not.
const base::Feature kAutofillSendExperimentIdsInPaymentsRPCs{ const base::Feature kAutofillSendExperimentIdsInPaymentsRPCs{
......
...@@ -55,7 +55,6 @@ extern const base::Feature kAutofillSaveCardDialogUnlabeledExpirationDate; ...@@ -55,7 +55,6 @@ extern const base::Feature kAutofillSaveCardDialogUnlabeledExpirationDate;
extern const base::Feature kAutofillSaveCardSignInAfterLocalSave; extern const base::Feature kAutofillSaveCardSignInAfterLocalSave;
extern const base::Feature kAutofillSaveCreditCardUsesStrikeSystem; extern const base::Feature kAutofillSaveCreditCardUsesStrikeSystem;
extern const base::Feature kAutofillSaveOnProbablySubmitted; extern const base::Feature kAutofillSaveOnProbablySubmitted;
extern const base::Feature kAutofillScanCardholderName;
extern const base::Feature kAutofillSendExperimentIdsInPaymentsRPCs; extern const base::Feature kAutofillSendExperimentIdsInPaymentsRPCs;
extern const base::Feature kAutofillSendOnlyCountryInGetUploadDetails; extern const base::Feature kAutofillSendOnlyCountryInGetUploadDetails;
extern const base::Feature kAutofillServerCommunication; extern const base::Feature kAutofillServerCommunication;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment