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

chrome/browser/autofill/autofill_external_delegate_unittest.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 <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
+#include "chrome/browser/tab_contents/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/gfx/rect.h"
 #include "webkit/forms/form_data.h"
 #include "webkit/forms/form_field.h"
 
@@ skipping 36 matching lines @@
 
  private:
   virtual void HideAutofillPopupInternal() {};
 };
 
 class MockAutofillManager : public AutofillManager {
  public:
   explicit MockAutofillManager(TabContents* tab_contents)
       // Force to use the constructor designated for unit test, but we don't
       // really need personal_data in this test so we pass a NULL pointer.
-      : AutofillManager(tab_contents, NULL) {}
+      : AutofillManager(&delegate_, tab_contents, NULL),
+       delegate_(tab_contents) {

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

nit: Indent one more space

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

Done.

+  }
 
   MOCK_METHOD4(OnFillAutofillFormData,
                void(int query_id,
                     const webkit::forms::FormData& form,
                     const webkit::forms::FormField& field,
                     int unique_id));
 
  protected:
   virtual ~MockAutofillManager() {}
+
+ private:
+  TabAutofillManagerDelegate delegate_;
 };
 
 }  // namespace
 
 class AutofillExternalDelegateUnitTest : public TabContentsTestHarness {
  public:
   AutofillExternalDelegateUnitTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {}
   virtual ~AutofillExternalDelegateUnitTest() {}
 
@@ skipping 151 matching lines @@
   external_delegate_->SelectAutofillSuggestionAtIndex(1);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   external_delegate_->DidEndTextFieldEditing();
 }