Switch AutofillManager to be UserData on WebContents.

chrome/browser/password_manager/password_manager_delegate_impl.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_delegate_impl.h"
 
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
@@ skipping 106 matching lines @@
 
 InfoBarDelegate::InfoBarAutomationType
     SavePasswordInfoBarDelegate::GetInfoBarAutomationType() const {
   return PASSWORD_INFOBAR;
 }
 
 // PasswordManagerDelegateImpl ------------------------------------------------
 
 void PasswordManagerDelegateImpl::FillPasswordForm(
     const webkit::forms::PasswordFormFillData& form_data) {
-  bool disable_popup = tab_contents_->autofill_manager()->HasExternalDelegate();
+  AutofillManager* autofill_manager =
+      AutofillManager::FromWebContents(tab_contents_->web_contents());
+  bool disable_popup = autofill_manager->HasExternalDelegate();
 
   tab_contents_->web_contents()->GetRenderViewHost()->Send(
       new AutofillMsg_FillPasswordForm(
           tab_contents_->web_contents()->GetRenderViewHost()->GetRoutingID(),
           form_data,
           disable_popup));
 }
 
 void PasswordManagerDelegateImpl::AddSavePasswordInfoBarIfPermitted(
     PasswordFormManager* form_to_save) {
@@ skipping 24 matching lines @@
 bool PasswordManagerDelegateImpl::DidLastPageLoadEncounterSSLErrors() {
   content::NavigationEntry* entry =
       tab_contents_->web_contents()->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return false;
   }
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }