| Index: chrome/browser/password_manager/mock_password_store.h
|
| diff --git a/chrome/browser/password_manager/mock_password_store.h b/chrome/browser/password_manager/mock_password_store.h
|
| index 627b5db4cbe62c02d9bb16d9309ea7d9f7f180a8..608c2ad1e531d3dbc25097ce923db9301a1c96ce 100644
|
| --- a/chrome/browser/password_manager/mock_password_store.h
|
| +++ b/chrome/browser/password_manager/mock_password_store.h
|
| @@ -6,8 +6,8 @@
|
| #define CHROME_BROWSER_PASSWORD_MANAGER_MOCK_PASSWORD_STORE_H_
|
|
|
| #include "chrome/browser/password_manager/password_store.h"
|
| +#include "content/public/common/password_form.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| -#include "webkit/forms/password_form.h"
|
|
|
| class Profile;
|
|
|
| @@ -17,26 +17,26 @@ class MockPasswordStore : public PasswordStore {
|
|
|
| static scoped_refptr<RefcountedProfileKeyedService> Build(Profile* profile);
|
|
|
| - MOCK_METHOD1(RemoveLogin, void(const webkit::forms::PasswordForm&));
|
| - MOCK_METHOD2(GetLogins, int(const webkit::forms::PasswordForm&,
|
| + MOCK_METHOD1(RemoveLogin, void(const content::PasswordForm&));
|
| + MOCK_METHOD2(GetLogins, int(const content::PasswordForm&,
|
| PasswordStoreConsumer*));
|
| - MOCK_METHOD1(AddLogin, void(const webkit::forms::PasswordForm&));
|
| - MOCK_METHOD1(UpdateLogin, void(const webkit::forms::PasswordForm&));
|
| + MOCK_METHOD1(AddLogin, void(const content::PasswordForm&));
|
| + MOCK_METHOD1(UpdateLogin, void(const content::PasswordForm&));
|
| MOCK_METHOD0(ReportMetrics, void());
|
| MOCK_METHOD0(ReportMetricsImpl, void());
|
| - MOCK_METHOD1(AddLoginImpl, void(const webkit::forms::PasswordForm&));
|
| - MOCK_METHOD1(UpdateLoginImpl, void(const webkit::forms::PasswordForm&));
|
| - MOCK_METHOD1(RemoveLoginImpl, void(const webkit::forms::PasswordForm&));
|
| + MOCK_METHOD1(AddLoginImpl, void(const content::PasswordForm&));
|
| + MOCK_METHOD1(UpdateLoginImpl, void(const content::PasswordForm&));
|
| + MOCK_METHOD1(RemoveLoginImpl, void(const content::PasswordForm&));
|
| MOCK_METHOD2(RemoveLoginsCreatedBetweenImpl, void(const base::Time&,
|
| const base::Time&));
|
| MOCK_METHOD2(GetLoginsImpl, void(GetLoginsRequest*,
|
| - const webkit::forms::PasswordForm&));
|
| + const content::PasswordForm&));
|
| MOCK_METHOD1(GetAutofillableLoginsImpl, void(GetLoginsRequest*));
|
| MOCK_METHOD1(GetBlacklistLoginsImpl, void(GetLoginsRequest*));
|
| MOCK_METHOD1(FillAutofillableLogins,
|
| - bool(std::vector<webkit::forms::PasswordForm*>*));
|
| + bool(std::vector<content::PasswordForm*>*));
|
| MOCK_METHOD1(FillBlacklistLogins,
|
| - bool(std::vector<webkit::forms::PasswordForm*>*));
|
| + bool(std::vector<content::PasswordForm*>*));
|
|
|
| virtual void ShutdownOnUIThread();
|
|
|
|
|