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

chrome/browser/password_manager/password_form_manager.cc

Index: chrome/browser/password_manager/password_form_manager.cc
===================================================================
--- chrome/browser/password_manager/password_form_manager.cc	(revision 146205)
+++ chrome/browser/password_manager/password_form_manager.cc	(working copy)
@@ -15,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/autofill_messages.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
 #include "webkit/forms/password_form_dom_manager.h"
 
 using base::Time;
@@ -23,7 +24,7 @@
 
 PasswordFormManager::PasswordFormManager(Profile* profile,
                                          PasswordManager* password_manager,
-                                         content::RenderViewHost* host,
+                                         content::WebContents* web_contents,
                                          const PasswordForm& observed_form,
                                          bool ssl_valid)
     : best_matches_deleter_(&best_matches_),
@@ -35,7 +36,7 @@
       preferred_match_(NULL),
       state_(PRE_MATCHING_PHASE),
       profile_(profile),
-      host_(host),
+      web_contents_(web_contents),
       manager_action_(kManagerActionNone),
       user_action_(kUserActionNone),
       submit_result_(kSubmitResultNotSubmitted) {
@@ -507,6 +508,7 @@
 }
 
 void PasswordFormManager::SendNotBlacklistedToRenderer() {
-  host_->Send(new AutofillMsg_FormNotBlacklisted(host_->GetRoutingID(),
+  content::RenderViewHost* host = web_contents_->GetRenderViewHost();
+  host->Send(new AutofillMsg_FormNotBlacklisted(host->GetRoutingID(),
                                                  observed_form_));
 }