[Password manager] Recognise squashed login+sign-up forms

components/autofill/core/common/password_form.cc

Index: components/autofill/core/common/password_form.cc
diff --git a/components/autofill/core/common/password_form.cc b/components/autofill/core/common/password_form.cc
index 3ff8447a069f2dc5ad457b86b2b08a51e14333f7..5e1d8f576bb9e3dd62604cac2bb6e3e62be378f0 100644
--- a/components/autofill/core/common/password_form.cc
+++ b/components/autofill/core/common/password_form.cc
@@ -21,7 +21,8 @@ PasswordForm::PasswordForm()
       type(TYPE_MANUAL),
       times_used(0),
       generation_upload_status(NO_SIGNAL_SENT),
-      skip_zero_click(false) {
+      skip_zero_click(false),
+      layout(Layout::LAYOUT_OTHER) {
 }
 
 PasswordForm::~PasswordForm() {
@@ -57,13 +58,26 @@ bool PasswordForm::operator==(const PasswordForm& form) const {
       display_name == form.display_name &&
       avatar_url == form.avatar_url &&
       federation_url == form.federation_url &&
-      skip_zero_click == form.skip_zero_click;
+      skip_zero_click == form.skip_zero_click &&
+      layout == form.layout;
 }
 
 bool PasswordForm::operator!=(const PasswordForm& form) const {
   return !operator==(form);
 }
 
+std::ostream& operator<<(std::ostream& os, PasswordForm::Layout layout) {
+  switch (layout) {
+    case PasswordForm::Layout::LAYOUT_OTHER:
+      os << "LAYOUT_OTHER";
+      break;
+    case PasswordForm::Layout::LAYOUT_LOGIN_AND_SIGNUP:
+      os << "LAYOUT_LOGIN_AND_SIGNUP";
+      break;
+  }
+  return os;
+}
+
 std::ostream& operator<<(std::ostream& os, const PasswordForm& form) {
   return os << "scheme: " << form.scheme
             << " signon_realm: " << form.signon_realm
@@ -94,7 +108,8 @@ std::ostream& operator<<(std::ostream& os, const PasswordForm& form) {
             << " display_name: " << base::UTF16ToUTF8(form.display_name)
             << " avatar_url: " << form.avatar_url
             << " federation_url: " << form.federation_url
-            << " skip_next_zero_click: " << form.skip_zero_click;
+            << " skip_next_zero_click: " << form.skip_zero_click
+            << " layout: " << form.layout;
 }
 
 }  // namespace autofill