Commit 1f314ffa authored by vabr@chromium.org's avatar vabr@chromium.org

Remove 'password_manager::' prefixes from code within that namespace

This is just a code clean-up. As long as it compiles, no change to the functionality.

BUG=348523

Review URL: https://codereview.chromium.org/271173002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269613 0039d316-1c4b-4281-b951-d872f2087c98
parent 07b3da30
...@@ -16,7 +16,7 @@ namespace password_manager { ...@@ -16,7 +16,7 @@ namespace password_manager {
// PasswordAutofillManager, public: // PasswordAutofillManager, public:
PasswordAutofillManager::PasswordAutofillManager( PasswordAutofillManager::PasswordAutofillManager(
password_manager::PasswordManagerClient* password_manager_client, PasswordManagerClient* password_manager_client,
autofill::AutofillManagerDelegate* autofill_manager_delegate) autofill::AutofillManagerDelegate* autofill_manager_delegate)
: password_manager_client_(password_manager_client), : password_manager_client_(password_manager_client),
autofill_manager_delegate_(autofill_manager_delegate), autofill_manager_delegate_(autofill_manager_delegate),
......
...@@ -24,7 +24,7 @@ class PasswordManagerClient; ...@@ -24,7 +24,7 @@ class PasswordManagerClient;
class PasswordAutofillManager : public autofill::AutofillPopupDelegate { class PasswordAutofillManager : public autofill::AutofillPopupDelegate {
public: public:
PasswordAutofillManager( PasswordAutofillManager(
password_manager::PasswordManagerClient* password_manager_client, PasswordManagerClient* password_manager_client,
autofill::AutofillManagerDelegate* autofill_manager_delegate); autofill::AutofillManagerDelegate* autofill_manager_delegate);
virtual ~PasswordAutofillManager(); virtual ~PasswordAutofillManager();
......
...@@ -29,41 +29,35 @@ namespace autofill { ...@@ -29,41 +29,35 @@ namespace autofill {
class AutofillPopupDelegate; class AutofillPopupDelegate;
} }
namespace password_manager {
namespace { namespace {
// TODO(dubroy): Implement a TestPasswordManagerDriver that can be shared by // TODO(dubroy): Implement a TestPasswordManagerDriver that can be shared by
// all the tests that need it (crbug.com/352566). // all the tests that need it (crbug.com/352566).
class MockPasswordManagerDriver class MockPasswordManagerDriver : public PasswordManagerDriver {
: public password_manager::PasswordManagerDriver {
public: public:
MOCK_METHOD1(FillPasswordForm, void(const autofill::PasswordFormFillData&)); MOCK_METHOD1(FillPasswordForm, void(const autofill::PasswordFormFillData&));
MOCK_METHOD0(DidLastPageLoadEncounterSSLErrors, bool()); MOCK_METHOD0(DidLastPageLoadEncounterSSLErrors, bool());
MOCK_METHOD0(IsOffTheRecord, bool()); MOCK_METHOD0(IsOffTheRecord, bool());
MOCK_METHOD0(GetPasswordGenerationManager, MOCK_METHOD0(GetPasswordGenerationManager, PasswordGenerationManager*());
password_manager::PasswordGenerationManager*()); MOCK_METHOD0(GetPasswordManager, PasswordManager*());
MOCK_METHOD0(GetPasswordManager, password_manager::PasswordManager*());
MOCK_METHOD0(GetAutofillManager, autofill::AutofillManager*()); MOCK_METHOD0(GetAutofillManager, autofill::AutofillManager*());
MOCK_METHOD1(AllowPasswordGenerationForForm, void(autofill::PasswordForm*)); MOCK_METHOD1(AllowPasswordGenerationForForm, void(autofill::PasswordForm*));
MOCK_METHOD1(AccountCreationFormsFound, MOCK_METHOD1(AccountCreationFormsFound,
void(const std::vector<autofill::FormData>&)); void(const std::vector<autofill::FormData>&));
MOCK_METHOD2(AcceptPasswordAutofillSuggestion, MOCK_METHOD2(AcceptPasswordAutofillSuggestion,
void(const base::string16&, const base::string16&)); void(const base::string16&, const base::string16&));
MOCK_METHOD0(GetPasswordAutofillManager, MOCK_METHOD0(GetPasswordAutofillManager, PasswordAutofillManager*());
password_manager::PasswordAutofillManager*());
}; };
class TestPasswordManagerClient class TestPasswordManagerClient : public PasswordManagerClient {
: public password_manager::PasswordManagerClient {
public: public:
virtual void PromptUserToSavePassword( virtual void PromptUserToSavePassword(
password_manager::PasswordFormManager* form_to_save) OVERRIDE {} PasswordFormManager* form_to_save) OVERRIDE {}
virtual password_manager::PasswordStore* GetPasswordStore() OVERRIDE { virtual PasswordStore* GetPasswordStore() OVERRIDE { return NULL; }
return NULL;
}
virtual PrefService* GetPrefs() OVERRIDE { return NULL; } virtual PrefService* GetPrefs() OVERRIDE { return NULL; }
virtual password_manager::PasswordManagerDriver* GetDriver() OVERRIDE { virtual PasswordManagerDriver* GetDriver() OVERRIDE { return &driver_; }
return &driver_;
}
virtual void AuthenticateAutofillAndFillForm( virtual void AuthenticateAutofillAndFillForm(
scoped_ptr<autofill::PasswordFormFillData> fill_data) OVERRIDE {} scoped_ptr<autofill::PasswordFormFillData> fill_data) OVERRIDE {}
virtual bool IsPasswordSyncEnabled() OVERRIDE { return false; } virtual bool IsPasswordSyncEnabled() OVERRIDE { return false; }
...@@ -109,18 +103,16 @@ class PasswordAutofillManagerTest : public testing::Test { ...@@ -109,18 +103,16 @@ class PasswordAutofillManagerTest : public testing::Test {
} }
void InitializePasswordAutofillManager( void InitializePasswordAutofillManager(
password_manager::PasswordManagerClient* client, PasswordManagerClient* client,
autofill::AutofillManagerDelegate* autofill_manager_delegate) { autofill::AutofillManagerDelegate* autofill_manager_delegate) {
password_autofill_manager_.reset( password_autofill_manager_.reset(
new password_manager::PasswordAutofillManager( new PasswordAutofillManager(client, autofill_manager_delegate));
client, autofill_manager_delegate));
password_autofill_manager_->OnAddPasswordFormMapping(username_field_, password_autofill_manager_->OnAddPasswordFormMapping(username_field_,
fill_data_); fill_data_);
} }
protected: protected:
scoped_ptr<password_manager::PasswordAutofillManager> scoped_ptr<PasswordAutofillManager> password_autofill_manager_;
password_autofill_manager_;
autofill::FormFieldData username_field_; autofill::FormFieldData username_field_;
base::string16 test_username_; base::string16 test_username_;
...@@ -189,3 +181,5 @@ TEST_F(PasswordAutofillManagerTest, ExternalDelegatePasswordSuggestions) { ...@@ -189,3 +181,5 @@ TEST_F(PasswordAutofillManagerTest, ExternalDelegatePasswordSuggestions) {
password_autofill_manager_->DidAcceptSuggestion( password_autofill_manager_->DidAcceptSuggestion(
suggestions[0], autofill::POPUP_ITEM_ID_PASSWORD_ENTRY); suggestions[0], autofill::POPUP_ITEM_ID_PASSWORD_ENTRY);
} }
} // namespace password_manager
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment