Revert "Revert 223907 "[password generation] Upload possible account cre...""

components/autofill/core/common/password_form.h

Index: components/autofill/core/common/password_form.h
diff --git a/components/autofill/core/common/password_form.h b/components/autofill/core/common/password_form.h
index 9ecb2145630d0858e39d3dea4dca06262588b749..8485225a35fc412d65b431b2771291574dbe3b05 100644
--- a/components/autofill/core/common/password_form.h
+++ b/components/autofill/core/common/password_form.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/time/time.h"
+#include "components/autofill/core/common/form_data.h"
 #include "url/gurl.h"
 
 namespace autofill {
@@ -180,9 +181,20 @@ struct PasswordForm {
   // When parsing an HTML form, this is not used.
   int times_used;
 
+  // Autofill representation of this form. Used to communicate with the
+  // Autofill servers if necessary. Currently this is only used to help
+  // determine forms where we can trigger password generation.
+  //
+  // When parsing an HTML form, this is normally set.
+  FormData form_data;
+
   // Returns true if this match was found using public suffix matching.
   bool IsPublicSuffixMatch() const;
 
+  // Equality operators for testing.
+  bool operator==(const PasswordForm& form) const;
+  bool operator!=(const PasswordForm& form) const;
+
   PasswordForm();
   ~PasswordForm();
 };
@@ -190,6 +202,10 @@ struct PasswordForm {
 // Map username to PasswordForm* for convenience. See password_form_manager.h.
 typedef std::map<string16, PasswordForm*> PasswordFormMap;
 
+// For testing.
+std::ostream& operator<<(std::ostream& os,
+                         const autofill::PasswordForm& form);
+
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__