Remove flags for controlling credit card scanner.

components/autofill/core/browser/autofill_manager.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 "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 239 matching lines @@
   external_delegate_ = delegate;
   autocomplete_history_manager_->SetExternalDelegate(delegate);
 }
 
 void AutofillManager::ShowAutofillSettings() {
   client_->ShowAutofillSettings();
 }
 
 bool AutofillManager::ShouldShowScanCreditCard(const FormData& form,
                                                const FormFieldData& field) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[Mathieu, 2016/08/02 20:45:34]

do you need to remove autofill_switches.h?

[please use gerrit instead, 2016/08/02 22:52:21]

Done.

-          switches::kDisableCreditCardScan)) {
-    return false;
-  }
-
   if (!client_->HasCreditCardScanFeature())
     return false;
 
   AutofillField* autofill_field = GetAutofillField(form, field);
   if (!autofill_field ||
       autofill_field->Type().GetStorableType() != CREDIT_CARD_NUMBER) {
     return false;
   }
 
   static const int kShowScanCreditCardMaxValueLength = 6;
@@ skipping 1772 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill