Index: components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc |
diff --git a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc |
index 7052a6fce816f901eca707e3f192a7fbbbe408ee..828b35910c211c08f6aabc44968fea104fcdbd73 100644 |
--- a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc |
+++ b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc |
@@ -17,8 +17,8 @@ |
#include "base/thread_task_runner_handle.h" |
#include "components/password_manager/content/common/credential_manager_messages.h" |
#include "components/password_manager/core/browser/credential_manager_password_form_manager.h" |
+#include "components/password_manager/core/browser/dummy_log_manager.h" |
#include "components/password_manager/core/browser/mock_affiliated_match_helper.h" |
-#include "components/password_manager/core/browser/password_manager.h" |
#include "components/password_manager/core/browser/stub_password_manager_client.h" |
#include "components/password_manager/core/browser/stub_password_manager_driver.h" |
#include "components/password_manager/core/browser/test_password_store.h" |
@@ -60,6 +60,7 @@ class MockPasswordManagerClient : public StubPasswordManagerClient { |
const std::vector<autofill::PasswordForm*>& federated_forms, |
const GURL& origin, |
base::Callback<void(const CredentialInfo&)> callback)); |
+ MOCK_CONST_METHOD0(GetLogManager, const LogManager*()); |
explicit MockPasswordManagerClient(PasswordStore* store) : store_(store) { |
prefs_.registry()->RegisterBooleanPref(prefs::kPasswordManagerAutoSignin, |
@@ -140,11 +141,6 @@ TestCredentialManagerDispatcher::GetDriver() { |
return driver_; |
} |
-class MockPasswordManagerDriver : public StubPasswordManagerDriver { |
- public: |
- MOCK_METHOD0(GetPasswordManager, PasswordManager*()); |
-}; |
- |
void RunAllPendingTasks() { |
base::RunLoop run_loop; |
base::MessageLoop::current()->PostTask( |
@@ -163,11 +159,10 @@ class CredentialManagerDispatcherTest |
content::RenderViewHostTestHarness::SetUp(); |
store_ = new TestPasswordStore; |
client_.reset(new MockPasswordManagerClient(store_.get())); |
- password_manager_.reset(new PasswordManager(client_.get())); |
- ON_CALL(mock_driver_, GetPasswordManager()) |
- .WillByDefault(testing::Return(password_manager_.get())); |
+ ON_CALL(*client_, GetLogManager()) |
+ .WillByDefault(testing::Return(&log_manager_)); |
dispatcher_.reset(new TestCredentialManagerDispatcher( |
- web_contents(), client_.get(), &mock_driver_)); |
+ web_contents(), client_.get(), &stub_driver_)); |
ON_CALL(*client_, IsSavingAndFillingEnabledForCurrentPage()) |
.WillByDefault(testing::Return(true)); |
ON_CALL(*client_, IsOffTheRecord()).WillByDefault(testing::Return(false)); |
@@ -276,9 +271,9 @@ class CredentialManagerDispatcherTest |
autofill::PasswordForm cross_origin_form_; |
scoped_refptr<TestPasswordStore> store_; |
scoped_ptr<MockPasswordManagerClient> client_; |
- MockPasswordManagerDriver mock_driver_; |
+ StubPasswordManagerDriver stub_driver_; |
scoped_ptr<CredentialManagerDispatcher> dispatcher_; |
- scoped_ptr<PasswordManager> password_manager_; |
+ DummyLogManager log_manager_; |
}; |
TEST_F(CredentialManagerDispatcherTest, CredentialManagerOnStore) { |