Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_state.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
 #include "url/gurl.h"
 
+namespace content {
+class WebContents;
+}
+
 namespace password_manager {
 struct CredentialInfo;
 class PasswordFormManager;
-class PasswordManagerClient;
 }
 
 
 // ManagePasswordsState keeps the current state for ManagePasswordsUIController
 // as well as up-to-date data for this state.
 class ManagePasswordsState {
  public:
   using CredentialsCallback =
       base::Callback<void(const password_manager::CredentialInfo&)>;
 
   ManagePasswordsState();
   ~ManagePasswordsState();
 
-  // Set the client for logging.
-  void set_client(password_manager::PasswordManagerClient* client) {
-    client_ = client;
+  void set_web_content(content::WebContents* web_contents) {
+    web_contents_ = web_contents;
   }
 
   // The methods below discard the current state/data of the object and move it
   // to the specified state.
 
   // Move to PENDING_PASSWORD_STATE.
   void OnPendingPassword(
       scoped_ptr<password_manager::PasswordFormManager> form_manager);
 
   // Move to CREDENTIAL_REQUEST_STATE.
@@ skipping 84 matching lines @@
 
   // Federated credentials for the CREDENTIAL_REQUEST_STATE.
   ScopedVector<const autofill::PasswordForm> federated_credentials_forms_;
 
   // A callback to be invoked when user selects a credential.
   CredentialsCallback credentials_callback_;
 
   // The current state of the password manager UI.
   password_manager::ui::State state_;
 
-  // The client used for logging.
-  password_manager::PasswordManagerClient* client_;
+  // Used to retrieve the client for logging.
+  content::WebContents* web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsState);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_STATE_H_