Should not show autofill drop-down for a user/pw form

chrome/renderer/autofill_helper.cc

 // Copyright (c) 2010 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 "chrome/renderer/autofill_helper.h"
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 74 matching lines @@
     v.erase(v.begin());
     l.erase(l.begin());
     i.erase(i.begin());
     ids.erase(ids.begin());
   }
 
   // If we were about to show a warning and we shouldn't, don't.
   if (ids[0] < 0 && !display_warning_if_disabled_)
     return;
 
+  // Only include "AutoFill Options" special menu item if we have AutoFill
+  // items, identified by |unique_ids| having at least one valid value.
+  bool has_autofill_item = false;
+  for (size_t i = 0; i < ids.size(); ++i) {
+    if (ids[i] > 0) {
+      has_autofill_item = true;
+      break;
+    }
+  }
+
   // The form has been auto-filled, so give the user the chance to clear the
   // form.  Append the 'Clear form' menu item.
-  if (form_manager_.FormWithNodeIsAutoFilled(autofill_query_node_)) {
+  if (has_autofill_item &&
+      form_manager_.FormWithNodeIsAutoFilled(autofill_query_node_)) {
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM));
     l.push_back(string16());
     i.push_back(string16());
     ids.push_back(0);
     suggestions_clear_index_ = v.size() - 1;
     separator_index = v.size() - 1;
   }
 
-  // Only include "AutoFill Options" special menu item if we have AutoFill
-  // items, identified by |unique_ids| having at least one valid value.
-  bool show_options = false;
-  for (size_t i = 0; i < ids.size(); ++i) {
-    if (ids[i] > 0) {
-      show_options = true;
-      break;
-    }
-  }
-  if (show_options) {
+  if (has_autofill_item) {
     // Append the 'Chrome Autofill options' menu item;
     v.push_back(l10n_util::GetStringFUTF16(IDS_AUTOFILL_OPTIONS_POPUP,
         WideToUTF16(chrome::kBrowserAppName)));
     l.push_back(string16());
     i.push_back(string16());
     ids.push_back(0);
     suggestions_options_index_ = v.size() - 1;
     separator_index = values.size();
   }
 
@@ skipping 204 matching lines @@
                                                 field);
 
   // WebFormControlElementToFormField does not scrape the DOM for the field
   // label, so find the label here.
   // TODO(jhawkins): Add form and field identities so we can use the cached form
   // data in FormManager.
   field->set_label(FormManager::LabelForElement(element));
 
   return true;
 }