| Index: chrome/browser/password_manager/password_form_manager_unittest.cc
|
| diff --git a/chrome/browser/password_manager/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc
|
| index 07f3e67dd6e48abcd20380fd7d4da1539265fab3..43f1a029004337a436666ca3b68584bde7957889 100644
|
| --- a/chrome/browser/password_manager/password_form_manager_unittest.cc
|
| +++ b/chrome/browser/password_manager/password_form_manager_unittest.cc
|
| @@ -12,16 +12,16 @@
|
| #include "chrome/browser/password_manager/password_manager_delegate.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| -#include "webkit/forms/password_form.h"
|
| +#include "content/public/common/password_form.h"
|
|
|
| -using webkit::forms::PasswordForm;
|
| +using content::PasswordForm;
|
|
|
| class TestPasswordManagerDelegate : public PasswordManagerDelegate {
|
| public:
|
| explicit TestPasswordManagerDelegate(Profile* profile) : profile_(profile) {}
|
|
|
| virtual void FillPasswordForm(
|
| - const webkit::forms::PasswordFormFillData& form_data) OVERRIDE {}
|
| + const PasswordFormFillData& form_data) OVERRIDE {}
|
| virtual void AddSavePasswordInfoBarIfPermitted(
|
| PasswordFormManager* form_to_save) OVERRIDE {}
|
| virtual Profile* GetProfile() OVERRIDE { return profile_; }
|
| @@ -37,9 +37,9 @@ class TestPasswordManager : public PasswordManager {
|
| : PasswordManager(NULL, delegate) {}
|
|
|
| virtual void Autofill(
|
| - const webkit::forms::PasswordForm& form_for_autofill,
|
| - const webkit::forms::PasswordFormMap& best_matches,
|
| - const webkit::forms::PasswordForm& preferred_match,
|
| + const content::PasswordForm& form_for_autofill,
|
| + const content::PasswordFormMap& best_matches,
|
| + const content::PasswordForm& preferred_match,
|
| bool wait_for_username) const OVERRIDE {}
|
| };
|
|
|
| @@ -47,7 +47,7 @@ class TestPasswordFormManager : public PasswordFormManager {
|
| public:
|
| TestPasswordFormManager(Profile* profile,
|
| PasswordManager* manager,
|
| - const webkit::forms::PasswordForm& observed_form,
|
| + const content::PasswordForm& observed_form,
|
| bool ssl_valid)
|
| : PasswordFormManager(profile, manager, NULL, observed_form, ssl_valid),
|
| num_sent_messages_(0) {}
|
|
|