Fix password manager internals renderer reporting

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.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/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*());
+  MockPasswordManagerClient() = default;
+  ~MockPasswordManagerClient() override = default;
+
+  MOCK_CONST_METHOD0(GetLogManager, const password_manager::LogManager*());
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockPasswordManagerClient);
 };
 
 }  // namespace
 
 ManagePasswordsUIControllerMock::ManagePasswordsUIControllerMock(
     content::WebContents* contents)
     : ManagePasswordsUIController(contents),
       navigated_to_settings_page_(false),
       saved_password_(false),
       updated_password_(false),
       never_saved_password_(false),
       choose_credential_(false),
       state_overridden_(false),
       state_(password_manager::ui::INACTIVE_STATE) {
   // 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()));
+  ON_CALL(*mock_client, GetLogManager())
+      .WillByDefault(testing::Return(&log_manager_));
   client_ = mock_client.Pass();
-  driver_ = mock_driver.Pass();
   set_client(client_.get());
 }
 
 ManagePasswordsUIControllerMock::
     ~ManagePasswordsUIControllerMock() {}
 
 void ManagePasswordsUIControllerMock::
     NavigateToPasswordManagerSettingsPage() {
   navigated_to_settings_page_ = true;
 }
@@ skipping 50 matching lines @@
   choose_credential_ = true;
   chosen_credential_ = form;
 }
 
 void ManagePasswordsUIControllerMock::PretendSubmittedPassword(
     ScopedVector<autofill::PasswordForm> best_matches) {
   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(),
+          password_manager_.get(), client_.get(), driver_.AsWeakPtr(),
           observed_form, true));
   form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
   form_manager->OnGetPasswordStoreResults(best_matches.Pass());
   OnPasswordSubmitted(form_manager.Pass());
 }