| Index: chrome/browser/password_manager/password_form_data.cc
|
| diff --git a/chrome/browser/password_manager/password_form_data.cc b/chrome/browser/password_manager/password_form_data.cc
|
| index bba715bffc04d74ffa076f68daa23c056f26c297..458de6f3550d364bbc24d221aaa9717243ff9aa1 100644
|
| --- a/chrome/browser/password_manager/password_form_data.cc
|
| +++ b/chrome/browser/password_manager/password_form_data.cc
|
| @@ -6,7 +6,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/password_manager/password_form_data.h"
|
|
|
| -using content::PasswordForm;
|
| +using autofill::PasswordForm;
|
|
|
| PasswordForm* CreatePasswordFormFromData(
|
| const PasswordFormData& form_data) {
|
| @@ -69,7 +69,7 @@ std::ostream& operator<<(std::ostream& os, const PasswordForm& form) {
|
| << "date_created: " << form.date_created.ToDoubleT();
|
| }
|
|
|
| -typedef std::set<const content::PasswordForm*> SetOfForms;
|
| +typedef std::set<const autofill::PasswordForm*> SetOfForms;
|
|
|
| bool ContainsSamePasswordFormsPtr(
|
| const std::vector<PasswordForm*>& first,
|
| @@ -105,8 +105,8 @@ bool ContainsSamePasswordFormsPtr(
|
| }
|
|
|
| bool ContainsSamePasswordForms(
|
| - std::vector<content::PasswordForm>& first,
|
| - std::vector<content::PasswordForm>& second) {
|
| + std::vector<autofill::PasswordForm>& first,
|
| + std::vector<autofill::PasswordForm>& second) {
|
| std::vector<PasswordForm*> first_ptr;
|
| for (unsigned int i = 0; i < first.size(); ++i) {
|
| first_ptr.push_back(&first[i]);
|
|
|