Update Confirmation UI for saved password change

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 <sstream>
 
 #include "base/json/json_writer.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 41 matching lines @@
   target->SetString("display_name", form.display_name);
   target->SetString("avatar_url", form.avatar_url.possibly_invalid_spec());
   target->SetString("federation_url",
                     form.federation_url.possibly_invalid_spec());
   target->SetBoolean("skip_next_zero_click", form.skip_zero_click);
   std::ostringstream layout_string_stream;
   layout_string_stream << form.layout;
   target->SetString("layout", layout_string_stream.str());
   target->SetBoolean("was_parsed_using_autofill_predictions",
                      form.was_parsed_using_autofill_predictions);
+  target->SetBoolean("is_password_change_form_without_username",
+                     form.is_password_change_form_without_username);
 }
 
 }  // namespace
 
 PasswordForm::PasswordForm()
     : scheme(SCHEME_HTML),
       username_marked_by_site(false),
       password_autocomplete_set(true),
       new_password_marked_by_site(false),
       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),
       layout(Layout::LAYOUT_OTHER),
       was_parsed_using_autofill_predictions(false),
-      is_alive(true) {
+      is_alive(true),
+      is_password_change_form_without_username(false) {
 }
 
 PasswordForm::~PasswordForm() {
   CHECK(is_alive);
   is_alive = false;
 }
 
 bool PasswordForm::IsPublicSuffixMatch() const {
   CHECK(is_alive);
   return !original_signon_realm.empty();
 }
 
 bool PasswordForm::operator==(const PasswordForm& form) const {
-  return scheme == form.scheme &&
-      signon_realm == form.signon_realm &&
-      original_signon_realm == form.original_signon_realm &&
-      origin == form.origin &&
-      action == form.action &&
-      submit_element == form.submit_element &&
-      username_element == form.username_element &&
-      username_marked_by_site == form.username_marked_by_site &&
-      username_value == form.username_value &&
-      other_possible_usernames == form.other_possible_usernames &&
-      password_element == form.password_element &&
-      password_value == form.password_value &&
-      password_autocomplete_set == form.password_autocomplete_set &&
-      new_password_element == form.new_password_element &&
-      new_password_marked_by_site == form.new_password_marked_by_site &&
-      new_password_value == form.new_password_value &&
-      ssl_valid == form.ssl_valid &&
-      preferred == form.preferred &&
-      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 &&
-      layout == form.layout &&
-      was_parsed_using_autofill_predictions ==
-          form.was_parsed_using_autofill_predictions;
+  return scheme == form.scheme && signon_realm == form.signon_realm &&
+         original_signon_realm == form.original_signon_realm &&

[vabr (Chromium), 2015/06/19 18:03:16]

Please keep this one equality check per line. I know this is due to
clang-format, so perhaps use
// To keep the equality checks one per line.
// clang-format off
...
// clang-format on

[dvadym, 2015/06/22 14:43:33]

Done.

+         origin == form.origin && action == form.action &&
+         submit_element == form.submit_element &&
+         username_element == form.username_element &&
+         username_marked_by_site == form.username_marked_by_site &&
+         username_value == form.username_value &&
+         other_possible_usernames == form.other_possible_usernames &&
+         password_element == form.password_element &&
+         password_value == form.password_value &&
+         password_autocomplete_set == form.password_autocomplete_set &&
+         new_password_element == form.new_password_element &&
+         new_password_marked_by_site == form.new_password_marked_by_site &&
+         new_password_value == form.new_password_value &&
+         ssl_valid == form.ssl_valid && preferred == form.preferred &&
+         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 && layout == form.layout &&
+         was_parsed_using_autofill_predictions ==
+             form.was_parsed_using_autofill_predictions &&
+         is_password_change_form_without_username ==
+             form.is_password_change_form_without_username;
 }
 
 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";
@@ skipping 27 matching lines @@
       form_json, base::JSONWriter::OPTIONS_PRETTY_PRINT, &form_as_string);
   base::TrimWhitespaceASCII(form_as_string, base::TRIM_ALL, &form_as_string);
   return os << "PasswordForm(" << form_as_string << ")";
 }
 
 std::ostream& operator<<(std::ostream& os, PasswordForm* form) {
   return os << "&" << *form;
 }
 
 }  // namespace autofill