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

chrome/browser/autofill/autofill_manager.h

Index: chrome/browser/autofill/autofill_manager.h
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index f2db3cef0d8a0b9ab9d988f81ffa1fa0e62ff732..f5400dcbadcc59f330fce525c82bcb4c5999ec5a 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -41,6 +41,7 @@ class TabContents;
 struct ViewHostMsg_FrameNavigate_Params;
 
 namespace autofill {
+class AutofillClient;
 class PasswordGenerator;
 }
 
@@ -73,7 +74,10 @@ class AutofillManager : public content::NotificationObserver,
                         public ProfileSyncServiceObserver,
                         public base::RefCounted<AutofillManager> {
  public:
-  explicit AutofillManager(TabContents* tab_contents);
+  // Lifetime of |client| and |tab_contents| must exceed lifetime of
+  // AutofillManager.
+  explicit AutofillManager(autofill::AutofillClient* client,
+                           TabContents* tab_contents);
 
   // Registers our Enable/Disable Autofill pref.
   static void RegisterUserPrefs(PrefServiceBase* prefs);
@@ -117,7 +121,8 @@ class AutofillManager : public content::NotificationObserver,
   typedef std::pair<std::string, size_t> GUIDPair;
 
   // Test code should prefer to use this constructor.
-  AutofillManager(TabContents* tab_contents,
+  AutofillManager(autofill::AutofillClient* client,
+                  TabContents* tab_contents,
                   PersonalDataManager* personal_data);
 
   // Returns the value of the AutofillEnabled pref.
@@ -169,6 +174,9 @@ class AutofillManager : public content::NotificationObserver,
   bool OnFormSubmitted(const webkit::forms::FormData& form,
                        const base::TimeTicks& timestamp);
 
+  // The AutofillClient.
+  autofill::AutofillClient* client_;

[Ilya Sherman, 2012/08/22 03:38:03]

nit: Please make this private, and expose accessors if needed for testing.

[Ilya Sherman, 2012/08/22 03:38:03]

nit: Can this be a const member?

[Jói, 2012/08/22 17:15:53]

Any subclass would seem to need this, so I think it makes sense to leave this as
protected.

[Jói, 2012/08/22 17:15:53]

Done.

[Ilya Sherman, 2012/08/22 21:47:59]

A subclass would presumably only need a getter.  I'm pretty sure that the style
I've seen in all the other Chromium code I've encountered is not to directly
expose members to subclasses.

[Jói, 2012/08/23 09:50:40]

Right now, the subclasses don't use the member (my mistake when responding
earlier - I think they did in an in-progress version before I sent for review)
so I just made it private and skipped the accessor.

+
  private:
   // content::WebContentsObserver:
   virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;