Fix password manager internals renderer reporting

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
index 611f739ea735588a8f09ea0a27e0db853e891990..2a51acb217a98457d61cc43b3d918d988875a832 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
@@ -6,8 +6,8 @@
 
 #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/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 "components/password_manager/core/common/credential_manager_types.h"
 #include "content/public/browser/web_contents.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -24,8 +24,13 @@ class MockPasswordManagerDriver
 class MockPasswordManagerClient
     : public password_manager::StubPasswordManagerClient {
  public:
-  MOCK_CONST_METHOD0(GetPasswordManager,
-                     const password_manager::PasswordManager*());
+  MockPasswordManagerClient() = default;
+  ~MockPasswordManagerClient() override = default;
+
+  MOCK_CONST_METHOD0(GetLogManager, const password_manager::LogManager*());
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockPasswordManagerClient);
 };
 
 }  // namespace
@@ -46,16 +51,11 @@ ManagePasswordsUIControllerMock::ManagePasswordsUIControllerMock(
   contents->SetUserData(UserDataKey(), this);
   scoped_ptr<MockPasswordManagerClient> mock_client(
       new MockPasswordManagerClient());
-  scoped_ptr<MockPasswordManagerDriver> mock_driver(
-      new MockPasswordManagerDriver());
   password_manager_.reset(
       new password_manager::PasswordManager(mock_client.get()));
-  ON_CALL(*mock_driver, GetPasswordManager())
-      .WillByDefault(testing::Return(password_manager_.get()));
-  ON_CALL(*mock_client, GetPasswordManager())
-      .WillByDefault(testing::Return(password_manager_.get()));
+  ON_CALL(*mock_client, GetLogManager())
+      .WillByDefault(testing::Return(&log_manager_));
   client_ = mock_client.Pass();
-  driver_ = mock_driver.Pass();
   set_client(client_.get());
 }
 
@@ -126,7 +126,7 @@ void ManagePasswordsUIControllerMock::PretendSubmittedPassword(
   autofill::PasswordForm observed_form = *best_matches[0];
   scoped_ptr<password_manager::PasswordFormManager> form_manager(
       new password_manager::PasswordFormManager(
-          password_manager_.get(), client_.get(), driver_->AsWeakPtr(),
+          password_manager_.get(), client_.get(), driver_.AsWeakPtr(),
           observed_form, true));
   form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
   form_manager->OnGetPasswordStoreResults(best_matches.Pass());