Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: chrome/browser/ui/passwords/manage_passwords_test.cc

Issue 1415533013: Fix password manager internals renderer reporting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Separate dummy log manager Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/passwords/manage_passwords_test.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_test.cc b/chrome/browser/ui/passwords/manage_passwords_test.cc
index 13634587e4bc771dff05796942af781a18062cb6..c48506bf4ef3ba1129f85115ae21decfe53ff05e 100644
--- a/chrome/browser/ui/passwords/manage_passwords_test.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_test.cc
@@ -15,13 +15,29 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "components/autofill/core/common/password_form.h"
+#include "components/password_manager/core/browser/dummy_log_manager.h"
#include "components/password_manager/core/browser/password_form_manager.h"
-#include "components/password_manager/core/browser/password_manager.h"
#include "components/password_manager/core/browser/password_manager_metrics_util.h"
#include "components/password_manager/core/browser/stub_password_manager_client.h"
#include "components/password_manager/core/browser/stub_password_manager_driver.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace {
+
+class MockPasswordManagerClient
+ : public password_manager::StubPasswordManagerClient {
+ public:
+ MockPasswordManagerClient() = default;
+ ~MockPasswordManagerClient() override = default;
+
+ MOCK_CONST_METHOD0(GetLogManager, const password_manager::LogManager*());
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(MockPasswordManagerClient);
+};
+
+} // namespace
+
ManagePasswordsTest::ManagePasswordsTest() {
}
@@ -53,12 +69,14 @@ void ManagePasswordsTest::SetupManagingPasswords() {
}
void ManagePasswordsTest::SetupPendingPassword() {
- password_manager::StubPasswordManagerClient client;
+ MockPasswordManagerClient client;
+ password_manager::DummyLogManager log_manager;
password_manager::StubPasswordManagerDriver driver;
- password_manager::PasswordManager password_manager(&client);
+ ON_CALL(client, GetLogManager()).WillByDefault(testing::Return(&log_manager));
+
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
new password_manager::PasswordFormManager(
- &password_manager, &client, driver.AsWeakPtr(), *test_form(), false));
+ nullptr, &client, driver.AsWeakPtr(), *test_form(), false));
test_form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
ScopedVector<autofill::PasswordForm> best_matches;
test_form_manager->OnGetPasswordStoreResults(best_matches.Pass());
@@ -66,12 +84,14 @@ void ManagePasswordsTest::SetupPendingPassword() {
}
void ManagePasswordsTest::SetupAutomaticPassword() {
- password_manager::StubPasswordManagerClient client;
+ MockPasswordManagerClient client;
+ password_manager::DummyLogManager log_manager;
password_manager::StubPasswordManagerDriver driver;
- password_manager::PasswordManager password_manager(&client);
+ ON_CALL(client, GetLogManager()).WillByDefault(testing::Return(&log_manager));
+
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
new password_manager::PasswordFormManager(
- &password_manager, &client, driver.AsWeakPtr(), *test_form(), false));
+ nullptr, &client, driver.AsWeakPtr(), *test_form(), false));
GetController()->OnAutomaticPasswordSave(test_form_manager.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698