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 281 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(

[Mathieu, 2016/11/07 14:32:27]

Let's change the name and documentation of this function so that it's clearer to
the reader what's going on. Let's also unit test it because the logic is
becoming non trivial.

in autofill_external_delegate.h
// Will remove Autofill warnings from |suggestions| if there are also
autocomplete entries in the vector. Note: at this point, it is assumed that if
there are Autofill warnings, they will be at the head of the vector and any
entry that is not an Autofill warning is considered an Autocomplete entry.
void PossiblyRemoveAutofillWarnings(...)

[lshang, 2016/11/08 06:00:57]

Done.

     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 &&

[Mathieu, 2016/11/07 14:32:27]

This works as long as POPUP_ITEM_ID_WARNING_MESSAGE is the only Autofill warning
type. Consider writing a small IsAutofillWarningEntry(int frontend_id) function

[lshang, 2016/11/08 06:00:57]

Done.

+         suggestions->front().frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE &&
+         suggestions->back().frontend_id != POPUP_ITEM_ID_WARNING_MESSAGE) {
+    // 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