Fix password manager internals renderer reporting

chrome/browser/ui/passwords/manage_passwords_test.cc

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..46e4a8b8c37725078be4f46c719872d3121d607f 100644
--- a/chrome/browser/ui/passwords/manage_passwords_test.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_test.cc
@@ -16,12 +16,28 @@
 #include "chrome/test/base/interactive_test_utils.h"
 #include "components/autofill/core/common/password_form.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_log_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 "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::StubLogManager 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::StubLogManager 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());
 }