HTTP Bad: Add warning message to autofill dropdown for http sites

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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
+namespace {
+
+// Returns true if the suggestion entry is an Autofill warning message.
+// Warning message should display on top of suggestion list.
+bool IsAutofillWarningEntry(int frontend_id) {
+  return frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE;
+}
+
+} // anonymous namespace
+
 AutofillExternalDelegate::AutofillExternalDelegate(AutofillManager* manager,
                                                    AutofillDriver* driver)
     : manager_(manager),
       driver_(driver),
       query_id_(0),
       has_autofill_suggestions_(false),
       has_shown_popup_for_current_edit_(false),
       should_show_scan_credit_card_(false),
       should_show_cc_signin_promo_(false),
       has_shown_address_book_prompt(false),
@@ skipping 22 matching lines @@
 
 void AutofillExternalDelegate::OnSuggestionsReturned(
     int query_id,
     const std::vector<Suggestion>& input_suggestions) {
   if (query_id != query_id_)
     return;
 
   // The suggestions and warnings are "above the fold" and are separated from
   // other menu items with a separator.
   std::vector<Suggestion> suggestions(input_suggestions);
-  // Add or hide warnings as appropriate.
-  ApplyAutofillWarnings(&suggestions);
+  // Hide warnings as appropriate.
+  PossiblyRemoveAutofillWarnings(&suggestions);
 
 #if !defined(OS_ANDROID)
   // If there are above the fold suggestions at this point, add a separator to
   // go between the values and menu items.
   if (!suggestions.empty()) {
     suggestions.push_back(Suggestion());
     suggestions.back().frontend_id = POPUP_ITEM_ID_SEPARATOR;
   }
 #endif
 
@@ skipping 207 matching lines @@
 
   DCHECK(driver_->RendererIsAvailable());
   // Fill the values for the whole form.
   manager_->FillOrPreviewForm(renderer_action,
                               query_id_,
                               query_form_,
                               query_field_,
                               unique_id);
 }
 
-void AutofillExternalDelegate::ApplyAutofillWarnings(
+void AutofillExternalDelegate::PossiblyRemoveAutofillWarnings(
     std::vector<Suggestion>* suggestions) {
-  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.
+  while (suggestions->size() > 1 &&
+         IsAutofillWarningEntry(suggestions->front().frontend_id) &&
+         !IsAutofillWarningEntry(suggestions->back().frontend_id)) {
+    // If we received warnings instead of suggestions from Autofill but regular
+    // suggestions from autocomplete, don't show the Autofill warnings.
     suggestions->erase(suggestions->begin());
   }
 }
 
 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) {
     base::string16 value =
@@ skipping 49 matching lines @@
   suggestions->insert(suggestions->begin(), data_list_values_.size(),
                       Suggestion());
   for (size_t i = 0; i < data_list_values_.size(); i++) {
     (*suggestions)[i].value = data_list_values_[i];
     (*suggestions)[i].label = data_list_labels_[i];
     (*suggestions)[i].frontend_id = POPUP_ITEM_ID_DATALIST_ENTRY;
   }
 }
 
 }  // namespace autofill