[Autofill] Fix popup delegate to show warnings correctly.

components/autofill/browser/autofill_external_delegate.cc

 // Copyright (c) 2012 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 "base/utf_string_conversions.h"
 #include "components/autofill/browser/autocomplete_history_manager.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 73 matching lines @@
     const std::vector<base::string16>& autofill_icons,
     const std::vector<int>& autofill_unique_ids) {
   if (query_id != autofill_query_id_)
     return;
 
   std::vector<base::string16> values(autofill_values);
   std::vector<base::string16> labels(autofill_labels);
   std::vector<base::string16> icons(autofill_icons);
   std::vector<int> ids(autofill_unique_ids);
 
+  // Add or hide warnings as appropriate.
+  ApplyAutofillWarnings(&values, &labels, &icons, &ids);
+
   // Add a separator to go between the values and menu items.
   values.push_back(base::string16());
   labels.push_back(base::string16());
   icons.push_back(base::string16());
   ids.push_back(WebAutofillClient::MenuItemIDSeparator);
 
-  ApplyAutofillWarnings(&values, &labels, &icons, &ids);
-
   // Only include "Autofill Options" special menu item if we have Autofill
   // suggestions.
   has_autofill_suggestion_ = false;
   for (size_t i = 0; i < ids.size(); ++i) {
     if (ids[i] > 0) {
       has_autofill_suggestion_ = true;
       break;
     }
   }
 
   if (has_autofill_suggestion_)
     ApplyAutofillOptions(&values, &labels, &icons, &ids);
 
   // Remove the separator if it is the last element.
-  // It is possible for ids to be empty at this point if the vectors were
-  // cleared by ApplyAutofillWarnings (which can occur if we shouldn't
-  // autocomplete or display warnings for this field).
-  if (!ids.empty() && ids.back() == WebAutofillClient::MenuItemIDSeparator) {
+  DCHECK_GT(ids.size(), 0U);
+  if (ids.back() == WebAutofillClient::MenuItemIDSeparator) {
     values.pop_back();
     labels.pop_back();
     icons.pop_back();
     ids.pop_back();
   }
 
   InsertDataListValues(&values, &labels, &icons, &ids);
 
   if (values.empty()) {
     // No suggestions, any popup currently showing is obsolete.
@@ skipping 253 matching lines @@
     if (!*content::Details<bool>(details).ptr())
       autofill_manager_->delegate()->HideAutofillPopup();
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     autofill_manager_->delegate()->HideAutofillPopup();
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace autofill