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

chrome/browser/autofill/autofill_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 23 matching lines @@
 class AutofillMetrics;
 class CreditCard;
 class PersonalDataManager;
 class PrefService;
 class ProfileSyncService;
 class TabContents;
 
 struct ViewHostMsg_FrameNavigate_Params;
 
 namespace autofill {
+class AutofillManagerDelegate;
 class PasswordGenerator;
 }
 
 namespace content {
 class RenderViewHost;
 }
 
 namespace gfx {
 class Rect;
 }
@@ skipping 12 matching lines @@
 }
 
 // Manages saving and restoring the user's personal information entered into web
 // forms.
 class AutofillManager : public content::NotificationObserver,
                         public content::WebContentsObserver,
                         public AutofillDownloadManager::Observer,
                         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::AutofillManagerDelegate* delegate,
+                           TabContents* tab_contents);
 
   // Registers our Enable/Disable Autofill pref.
   static void RegisterUserPrefs(PrefServiceBase* prefs);
 
   // Set our external delegate.
   // TODO(jrg): consider passing delegate into the ctor.  That won't
   // work if the delegate has a pointer to the AutofillManager, but
   // future directions may not need such a pointer.
   void SetExternalDelegate(AutofillExternalDelegate* delegate) {
     external_delegate_ = delegate;
@@ skipping 23 matching lines @@
   // Only test code should subclass AutofillManager.
   friend class base::RefCounted<AutofillManager>;
   virtual ~AutofillManager();
 
   // The string/int pair is composed of the guid string and variant index
   // respectively.  The variant index is an index into the multi-valued item
   // (where applicable).
   typedef std::pair<std::string, size_t> GUIDPair;
 
   // Test code should prefer to use this constructor.
-  AutofillManager(TabContents* tab_contents,
+  AutofillManager(autofill::AutofillManagerDelegate* delegate,
+                  TabContents* tab_contents,
                   PersonalDataManager* personal_data);
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
   // Uploads the form data to the Autofill server.
   virtual void UploadFormData(const FormStructure& submitted_form);
 
   // Reset cache.
   void Reset();
@@ skipping 31 matching lines @@
   AutofillExternalDelegate* external_delegate() {
     return external_delegate_;
   }
 
   // Processes the submitted |form|, saving any new Autofill data and uploading
   // the possible field types for the submitted fields to the crowdsouring
   // server.  Returns false if this form is not relevant for Autofill.
   bool OnFormSubmitted(const webkit::forms::FormData& form,
                        const base::TimeTicks& timestamp);
 
+  autofill::AutofillManagerDelegate* const delegate_;

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

Note that there is also a member named |external_delegate_|, so this name is
somewhat confusing in context.  It would be nice to rationalize the two
somehow...

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

Renamed this one manager_delegate_.

+
  private:
   // content::WebContentsObserver:
   virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // AutofillDownloadManager::Observer:
   virtual void OnLoadedServerPredictions(
@@ skipping 221 matching lines @@
                            TestTabContentsWithExternalDelegate);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FormFillDuration);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_