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

components/autofill/core/common/password_form.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__
 #define COMPONENTS_AUTOFILL_CORE_COMMON_PASSWORD_FORM_H__
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/time/time.h"
+#include "components/autofill/core/common/form_data.h"
 #include "url/gurl.h"
 
 namespace autofill {
 
 // The PasswordForm struct encapsulates information about a login form,
 // which can be an HTML form or a dialog with username/password text fields.
 //
 // The Web Data database stores saved username/passwords and associated form
 // metdata using a PasswordForm struct, typically one that was created from
 // a parsed HTMLFormElement or LoginDialog, but the saved entries could have
@@ skipping 150 matching lines @@
 
   // The form type. Not used yet. Please see http://crbug.com/152422
   Type type;
 
   // The number of times that this username/password has been used to
   // authenticate the user.
   //
   // 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();
 };
 
 // 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__