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

chrome/browser/password_manager/password_manager.cc

 // 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.
 
 #include "chrome/browser/password_manager/password_manager.h"
 
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
@@ skipping 74 matching lines @@
     }
   }
   // If there is no corresponding PasswordFormManager, we create one. This is
   // not the common case, and should only happen when there is a bug in our
   // ability to detect forms.
   bool ssl_valid = (form.origin.SchemeIsSecure() &&
                     !delegate_->DidLastPageLoadEncounterSSLErrors());
   PasswordFormManager* manager =
       new PasswordFormManager(delegate_->GetProfile(),
                               this,
-                              web_contents()->GetRenderViewHost(),
+                              web_contents(),
                               form,
                               ssl_valid);
   pending_login_managers_.push_back(manager);
   manager->SetHasGeneratedPassword();
   // TODO(gcasto): Add UMA stats to track this.
 }
 
 bool PasswordManager::IsSavingEnabled() const {
   return IsFillingEnabled() && !delegate_->GetProfile()->IsOffTheRecord();
 }
@@ skipping 87 matching lines @@
 
   // Ask the SSLManager for current security.
   bool had_ssl_error = delegate_->DidLastPageLoadEncounterSSLErrors();
 
   for (std::vector<PasswordForm>::const_iterator iter = forms.begin();
        iter != forms.end(); ++iter) {
     bool ssl_valid = iter->origin.SchemeIsSecure() && !had_ssl_error;
     PasswordFormManager* manager =
         new PasswordFormManager(delegate_->GetProfile(),
                                 this,
-                                web_contents()->GetRenderViewHost(),
+                                web_contents(),
                                 *iter,
                                 ssl_valid);
     pending_login_managers_.push_back(manager);
     manager->FetchMatchingLoginsFromPasswordStore();
   }
 }
 
 void PasswordManager::OnPasswordFormsRendered(
     const std::vector<PasswordForm>& visible_forms) {
   if (!provisional_save_manager_.get())
@@ skipping 57 matching lines @@
       if (observer_) {
         observer_->OnAutofillDataAvailable(preferred_match.username_value,
                                            preferred_match.password_value);
       }
   }
 }
 
 bool PasswordManager::IsFillingEnabled() const {
   return delegate_->GetProfile() && *password_manager_enabled_;
 }