Revert 146192 - Revert 146164 - Always query for the latest RenderViewHost from WebContents before …

chrome/browser/password_manager/password_form_manager.h

 // Copyright (c) 2012 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_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "webkit/forms/password_form.h"
 
 namespace content {
-class RenderViewHost;
+class WebContents;
 }  // namespace content
 
 class PasswordManager;
 class PasswordStore;
 class Profile;
 
 // Per-password-form-{on-page, dialog} class responsible for interactions
 // between a given form, the per-tab PasswordManager, and the PasswordStore.
 class PasswordFormManager : public PasswordStoreConsumer {
  public:
   // profile contains the link to the PasswordStore and whether we're off
   //           the record
   // password_manager owns this object
   // form_on_page is the form that may be submitted and could need login data.
   // ssl_valid represents the security of the page containing observed_form,
   //           used to filter login results from database.
   PasswordFormManager(Profile* profile,
                       PasswordManager* password_manager,
-                      content::RenderViewHost* host,
+                      content::WebContents* web_contents,
                       const webkit::forms::PasswordForm& observed_form,
                       bool ssl_valid);
   virtual ~PasswordFormManager();
 
   // Compare basic data of observed_form_ with argument.
   bool DoesManage(const webkit::forms::PasswordForm& form) const;
 
   // Retrieves potential matching logins from the database.
   void FetchMatchingLoginsFromPasswordStore();
 
@@ skipping 187 matching lines @@
   } PasswordFormManagerState;
 
   // State of matching process, used to verify that we don't call methods
   // assuming we've already processed the request for matching logins,
   // when we actually haven't.
   PasswordFormManagerState state_;
 
   // The profile from which we get the PasswordStore.
   Profile* profile_;
 
-  // Render view host for sending messages to the corresponding renderer.
-  content::RenderViewHost* host_;
+  // Web contents from which we get the RenderViewHost for sending messages to
+  // the corresponding renderer.
+  content::WebContents* web_contents_;
 
   // These three fields record the "ActionsTaken" by the browser and
   // the user with this form, and the result. They are combined and
   // recorded in UMA when the manager is destroyed.
   ManagerAction manager_action_;
   UserAction user_action_;
   SubmitResult submit_result_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordFormManager);
 };
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_