Revert of [Password Manager] Send username correction votes

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 <algorithm>
 #include <ostream>
 #include <sstream>
 
 #include "base/json/json_writer.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/core/common/password_form.h"
 
@@ skipping 18 matching lines @@
   target->SetString("password_elem", form.password_element);
   target->SetString("password_value", form.password_value);
   target->SetBoolean("password_value_is_default",
                      form.password_value_is_default);
   target->SetString("new_password_element", form.new_password_element);
   target->SetString("new_password_value", form.new_password_value);
   target->SetBoolean("new_password_value_is_default",
                      form.new_password_value_is_default);
   target->SetBoolean("new_password_marked_by_site",
                      form.new_password_marked_by_site);
-  target->SetString(
-      "other_possible_usernames",
-      OtherPossibleUsernamesToString(form.other_possible_usernames));
+  target->SetString("other_possible_usernames",
+                    base::JoinString(form.other_possible_usernames,
+                                     base::ASCIIToUTF16("|")));
   target->SetBoolean("blacklisted", form.blacklisted_by_user);
   target->SetBoolean("preferred", form.preferred);
   target->SetDouble("date_created", form.date_created.ToDoubleT());
   target->SetDouble("date_synced", form.date_synced.ToDoubleT());
   target->SetInteger("type", form.type);
   target->SetInteger("times_used", form.times_used);
   std::ostringstream form_data_string_stream;
   form_data_string_stream << form.form_data;
   target->SetString("form_data", form_data_string_stream.str());
   target->SetInteger("generation_upload_status", form.generation_upload_status);
@@ skipping 104 matching lines @@
   if (result)
     return result < 0;
 
   result = left->password_element.compare(right->password_element);
   if (result)
     return result < 0;
 
   return left->origin < right->origin;
 }
 
-base::string16 OtherPossibleUsernamesToString(
-    const PossibleUsernamesVector& possible_usernames) {
-  std::vector<base::string16> pairs(possible_usernames.size());
-  std::transform(possible_usernames.begin(), possible_usernames.end(),
-                 pairs.begin(), [](const PossibleUsernamePair& p) {
-                   return p.first + base::ASCIIToUTF16("+") + p.second;
-                 });
-  return base::JoinString(pairs, base::ASCIIToUTF16(", "));
-}
-
 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;
@@ skipping 21 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