Introduce AutofillClient and use it to get rid of PasswordManager dependency.

chrome/browser/ui/tab_contents/tab_contents.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/ui/tab_contents/tab_contents.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
+#include "chrome/browser/chrome_autofill_client.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/external_protocol/external_protocol_observer.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/net/load_time_stats.h"
 #include "chrome/browser/omnibox_search_hint.h"
 #include "chrome/browser/password_manager/password_manager.h"
@@ skipping 60 matching lines @@
   // Stash this in the property bag so it can be retrieved without having to
   // go to a Browser.
   property_accessor()->SetProperty(contents->GetPropertyBag(), this);
 
   // Create the tab helpers.
   // restore_tab_helper because it sets up the tab ID, and other helpers may
   // rely on that.
   restore_tab_helper_.reset(new RestoreTabHelper(contents));
 
   autocomplete_history_manager_.reset(new AutocompleteHistoryManager(contents));
-  autofill_manager_ = new AutofillManager(this);
+  autofill_client_.reset(new ChromeAutofillClient(this));
+  autofill_manager_ = new AutofillManager(autofill_client_.get(), this);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExternalAutofillPopup)) {
     autofill_external_delegate_.reset(
         AutofillExternalDelegate::Create(this, autofill_manager_.get()));
     autofill_manager_->SetExternalDelegate(autofill_external_delegate_.get());
     autocomplete_history_manager_->SetExternalDelegate(
         autofill_external_delegate_.get());
   }
 #if defined(ENABLE_AUTOMATION)
   automation_tab_helper_.reset(new AutomationTabHelper(contents));
@@ skipping 153 matching lines @@
 #if defined(ENABLE_SESSION_SERVICE)
   SessionService* session =
       SessionServiceFactory::GetForProfile(profile());
   if (session) {
     session->SetTabUserAgentOverride(restore_tab_helper()->window_id(),
                                      restore_tab_helper()->session_id(),
                                      user_agent);
   }
 #endif
 }