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

components/autofill/core/common/password_form.cc

 // 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.
 
 #include <ostream>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/password_form.h"
 
 namespace autofill {
 
 PasswordForm::PasswordForm()
     : scheme(SCHEME_HTML),
       username_marked_by_site(false),
       password_autocomplete_set(true),
       ssl_valid(false),
       preferred(false),
       blacklisted_by_user(false),
       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() {
 }
 
 bool PasswordForm::IsPublicSuffixMatch() const {
   return !original_signon_realm.empty();
 }
 
 bool PasswordForm::operator==(const PasswordForm& form) const {
@@ skipping 15 matching lines @@
       date_created == form.date_created &&
       date_synced == form.date_synced &&
       blacklisted_by_user == form.blacklisted_by_user &&
       type == form.type &&
       times_used == form.times_used &&
       form_data.SameFormAs(form.form_data) &&
       generation_upload_status == form.generation_upload_status &&
       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
             << " origin: " << form.origin
             << " action: " << form.action
             << " submit_element: " << base::UTF16ToUTF8(form.submit_element)
             << " username_elem: " << base::UTF16ToUTF8(form.username_element)
             << " username_marked_by_site: " << form.username_marked_by_site
             << " username_value: " << base::UTF16ToUTF8(form.username_value)
             << " password_elem: " << base::UTF16ToUTF8(form.password_element)
@@ skipping 10 matching lines @@
             << " ssl_valid: " << form.ssl_valid
             << " date_created: " << form.date_created.ToDoubleT()
             << " date_synced: " << form.date_synced.ToDoubleT()
             << " type: " << form.type
             << " times_used: " << form.times_used
             << " form_data: " << form.form_data
             << " generation_upload_status: " << form.generation_upload_status
             << " 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