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..bcc8ed1308d19206718dd5601c2699f00eb7c4ed 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc
@@ -5,31 +5,11 @@
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.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/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"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
-class MockPasswordManagerDriver
-    : public password_manager::StubPasswordManagerDriver {
- public:
-  MOCK_METHOD0(GetPasswordManager, password_manager::PasswordManager*());
-};
-
-class MockPasswordManagerClient
-    : public password_manager::StubPasswordManagerClient {
- public:
-  MOCK_CONST_METHOD0(GetPasswordManager,
-                     const password_manager::PasswordManager*());
-};
-
-}  // namespace
-
 ManagePasswordsUIControllerMock::ManagePasswordsUIControllerMock(
     content::WebContents* contents)
     : ManagePasswordsUIController(contents),
@@ -39,24 +19,13 @@ ManagePasswordsUIControllerMock::ManagePasswordsUIControllerMock(
       never_saved_password_(false),
       choose_credential_(false),
       state_overridden_(false),
-      state_(password_manager::ui::INACTIVE_STATE) {
+      state_(password_manager::ui::INACTIVE_STATE),
+      password_manager_(&client_) {
   // Do not silently replace an existing ManagePasswordsUIController because it
   // unregisters itself in WebContentsDestroyed().
   EXPECT_FALSE(contents->GetUserData(UserDataKey()));
   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()));
-  client_ = mock_client.Pass();
-  driver_ = mock_driver.Pass();
-  set_client(client_.get());
+  set_client(&client_);
 }
 
 ManagePasswordsUIControllerMock::
@@ -125,9 +94,9 @@ void ManagePasswordsUIControllerMock::PretendSubmittedPassword(
   ASSERT_FALSE(best_matches.empty());
   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(),
-          observed_form, true));
+      new password_manager::PasswordFormManager(&password_manager_, &client_,
+                                                driver_.AsWeakPtr(),
+                                                observed_form, true));
   form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
   form_manager->OnGetPasswordStoreResults(best_matches.Pass());
   OnPasswordSubmitted(form_manager.Pass());