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

chrome/browser/password_manager/password_form_manager.h

Index: chrome/browser/password_manager/password_form_manager.h
===================================================================
--- chrome/browser/password_manager/password_form_manager.h	(revision 146205)
+++ chrome/browser/password_manager/password_form_manager.h	(working copy)
@@ -15,7 +15,7 @@
 #include "webkit/forms/password_form.h"
 
 namespace content {
-class RenderViewHost;
+class WebContents;
 }  // namespace content
 
 class PasswordManager;
@@ -34,7 +34,7 @@
   //           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();
@@ -242,8 +242,9 @@
   // 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