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

chrome/browser/password_manager/password_form_data.h

 // Copyright (c) 2011 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 CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_DATA_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_DATA_H_
 
 #include <ostream>
 
 #include "components/autofill/core/common/password_form.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+// TODO(sync): This file must eventually be refactored away -- crbug.com/87185.
+
 // Struct used for creation of PasswordForms from static arrays of data.
 // Note: This is only meant to be used in unit test.
 struct PasswordFormData {
   const autofill::PasswordForm::Scheme scheme;
   const char* signon_realm;
   const char* origin;
   const char* action;
   const wchar_t* submit_element;
   const wchar_t* username_element;
   const wchar_t* password_element;
@@ skipping 12 matching lines @@
 // Checks whether two vectors of PasswordForms contain equivalent elements,
 // regardless of order.
 bool ContainsSamePasswordFormsPtr(
     const std::vector<autofill::PasswordForm*>& first,
     const std::vector<autofill::PasswordForm*>& second);
 
 bool ContainsSamePasswordForms(
     std::vector<autofill::PasswordForm>& first,
     std::vector<autofill::PasswordForm>& second);
 
-// Pretty-prints the contents of a PasswordForm.
-// TODO(sync): This file must eventually be refactored away -- crbug.com/87185.
-std::ostream& operator<<(std::ostream& os,
-                         const autofill::PasswordForm& form);
-
 // This gmock matcher is used to check that the |arg| contains exactly the same
 // PasswordForms as |forms|, regardless of order.
 MATCHER_P(ContainsAllPasswordForms, forms, "") {
   return ContainsSamePasswordFormsPtr(forms, arg);
 }
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_DATA_H_