Index: components/password_manager/core/browser/password_form_data.cc |
diff --git a/components/password_manager/core/browser/password_form_data.cc b/components/password_manager/core/browser/password_form_data.cc |
index 649384fe7f91764f930b982f0df14cd97ec558ed..a53328eb2748be16ba08cdaba4444924aab8e410 100644 |
--- a/components/password_manager/core/browser/password_form_data.cc |
+++ b/components/password_manager/core/browser/password_form_data.cc |
@@ -10,8 +10,9 @@ using autofill::PasswordForm; |
namespace password_manager { |
-PasswordForm* CreatePasswordFormFromData(const PasswordFormData& form_data) { |
- PasswordForm* form = new PasswordForm(); |
+scoped_ptr<PasswordForm> CreatePasswordFormFromData( |
+ const PasswordFormData& form_data) { |
+ scoped_ptr<PasswordForm> form(new PasswordForm()); |
form->scheme = form_data.scheme; |
form->preferred = form_data.preferred; |
form->ssl_valid = form_data.ssl_valid; |
@@ -35,7 +36,7 @@ PasswordForm* CreatePasswordFormFromData(const PasswordFormData& form_data) { |
} else { |
form->blacklisted_by_user = true; |
} |
- return form; |
+ return form.Pass(); |
} |
typedef std::set<const autofill::PasswordForm*> SetOfForms; |
@@ -72,17 +73,4 @@ bool ContainsSamePasswordFormsPtr(const std::vector<PasswordForm*>& first, |
return true; |
} |
-bool ContainsSamePasswordForms(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]); |
- } |
- std::vector<PasswordForm*> second_ptr; |
- for (unsigned int i = 0; i < second.size(); ++i) { |
- second_ptr.push_back(&second[i]); |
- } |
- return ContainsSamePasswordFormsPtr(first_ptr, second_ptr); |
-} |
- |
} // namespace password_manager |