[Password Generation] Always query password forms via Autofill

components/autofill/core/browser/form_structure.h

Index: components/autofill/core/browser/form_structure.h
diff --git a/components/autofill/core/browser/form_structure.h b/components/autofill/core/browser/form_structure.h
index cead91f3b615310fd28f8b11d74af650ef95de92..d2bdb7ecc16628a68031bb795f189fd020331ae4 100644
--- a/components/autofill/core/browser/form_structure.h
+++ b/components/autofill/core/browser/form_structure.h
@@ -105,7 +105,11 @@ class FormStructure {
 
   // Returns true if we should query the crowdsourcing server to determine this
   // form's field types.  If the form includes author-specified types, this will
-  // return false.
+  // return false unless there are password fields in the form. If there are no
+  // password fields the assumption is that the author has expressed their
+  // intent and crowdsourced data should not be used to override this. Password
+  // fields are different because there is no way to specify password generation
+  // directly.
   bool ShouldBeCrowdsourced() const;
 
   // Sets the field types to be those set for |cached_form|.
@@ -252,6 +256,9 @@ class FormStructure {
   // author, via the |autocompletetype| attribute.
   bool has_author_specified_types_;
 
+  // True if the form contains at least one password field.
+  bool has_password_field_;
+
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };