Remove --respect-autocomplete-off-autofill flag.

components/autofill/core/browser/autofill_external_delegate.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_external_delegate.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 29 matching lines @@
 void EmitHistogram(AccessAddressBookEventType type) {
   UMA_HISTOGRAM_ENUMERATION(
       "Autofill.MacAddressBook", type, ACCESS_ADDRESS_BOOK_ENTRY_MAX);
 }
 
 }  // namespace
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 namespace autofill {
 
-namespace {
-
-bool ShouldAutofill(const FormFieldData& form_field) {
-  return form_field.should_autocomplete ||
-         !base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kRespectAutocompleteOffForAutofill);
-}
-
-}  // namespace
-
 AutofillExternalDelegate::AutofillExternalDelegate(AutofillManager* manager,
                                                    AutofillDriver* driver)
     : manager_(manager),
       driver_(driver),
       query_id_(0),
-      display_warning_if_disabled_(false),
       has_suggestion_(false),
       has_shown_popup_for_current_edit_(false),
       should_show_scan_credit_card_(false),
       has_shown_address_book_prompt(false),
       weak_ptr_factory_(this) {
   DCHECK(manager);
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {}
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const FormData& form,
                                        const FormFieldData& field,
-                                       const gfx::RectF& element_bounds,
-                                       bool display_warning_if_disabled) {
+                                       const gfx::RectF& element_bounds) {
   if (!query_form_.SameFormAs(form))
     has_shown_address_book_prompt = false;
 
   query_form_ = form;
   query_field_ = field;
-  display_warning_if_disabled_ = display_warning_if_disabled;
   query_id_ = query_id;
   element_bounds_ = element_bounds;
   should_show_scan_credit_card_ =
       manager_->ShouldShowScanCreditCard(query_form_, query_field_);
 }
 
 void AutofillExternalDelegate::OnSuggestionsReturned(
     int query_id,
     const std::vector<Suggestion>& input_suggestions) {
   if (query_id != query_id_)
@@ skipping 196 matching lines @@
 void AutofillExternalDelegate::ClearPreviewedForm() {
   driver_->RendererShouldClearPreviewedForm();
 }
 
 void AutofillExternalDelegate::Reset() {
   manager_->client()->HideAutofillPopup();
 }
 
 void AutofillExternalDelegate::OnPingAck() {
   // Reissue the most recent query, which will reopen the Autofill popup.
-  manager_->OnQueryFormFieldAutofill(query_id_,
-                                     query_form_,
-                                     query_field_,
-                                     element_bounds_,
-                                     display_warning_if_disabled_);
+  manager_->OnQueryFormFieldAutofill(query_id_, query_form_, query_field_,
+                                     element_bounds_);
 }
 
 base::WeakPtr<AutofillExternalDelegate> AutofillExternalDelegate::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void AutofillExternalDelegate::OnCreditCardScanned(
     const base::string16& card_number,
     int expiration_month,
     int expiration_year) {
@@ skipping 16 matching lines @@
   // Fill the values for the whole form.
   manager_->FillOrPreviewForm(renderer_action,
                               query_id_,
                               query_form_,
                               query_field_,
                               unique_id);
 }
 
 void AutofillExternalDelegate::ApplyAutofillWarnings(
     std::vector<Suggestion>* suggestions) {
-  if (!ShouldAutofill(query_field_)) {
-    // Autofill is disabled.  If there were some profile or credit card
-    // suggestions to show, show a warning instead.  Otherwise, clear out the
-    // list of suggestions.
-    if (!suggestions->empty() && (*suggestions)[0].frontend_id > 0) {
-      // If Autofill is disabled and we had suggestions, show a warning instead.
-      suggestions->assign(1, Suggestion(
-          l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_FORM_DISABLED)));
-      (*suggestions)[0].frontend_id = POPUP_ITEM_ID_WARNING_MESSAGE;
-    } else {
-      suggestions->clear();
-    }
-  } else if (suggestions->size() > 1 &&
-             (*suggestions)[0].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE) {
+  if (suggestions->size() > 1 &&
+      (*suggestions)[0].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE) {
     // If we received a warning instead of suggestions from Autofill but regular
     // suggestions from autocomplete, don't show the Autofill warning.
     suggestions->erase(suggestions->begin());
   }
-
-  // If we were about to show a warning and we shouldn't, don't.
-  if (!suggestions->empty() &&
-      (*suggestions)[0].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE &&
-      !display_warning_if_disabled_) {
-    suggestions->clear();
-  }
 }
 
 void AutofillExternalDelegate::ApplyAutofillOptions(
     std::vector<Suggestion>* suggestions) {
   // The form has been auto-filled, so give the user the chance to clear the
   // form.  Append the 'Clear form' menu item.
   if (query_field_.is_autofilled) {
     suggestions->push_back(Suggestion(
         l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM)));
     suggestions->back().frontend_id = POPUP_ITEM_ID_CLEAR_FORM;
@@ skipping 27 matching lines @@
   }
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 void AutofillExternalDelegate::PingRenderer() {
   driver_->PingRenderer();
 }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 }  // namespace autofill