Abstracted AcceptPasswordAutofillSuggestion IPC out of core Autofill code.

chrome/browser/ui/autofill/autofill_popup_controller_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 "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
@@ skipping 17 matching lines @@
 using ::testing::AtLeast;
 using ::testing::NiceMock;
 using base::WeakPtr;
 using blink::WebAutofillClient;
 
 namespace autofill {
 namespace {
 
 class MockAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
-  MockAutofillExternalDelegate(content::WebContents* web_contents,
-                               AutofillManager* autofill_manager,
+  MockAutofillExternalDelegate(AutofillManager* autofill_manager,
                                AutofillDriver* autofill_driver)
-      : AutofillExternalDelegate(web_contents, autofill_manager,
+      : AutofillExternalDelegate(autofill_manager,
                                  autofill_driver) {}

[Ilya Sherman, 2013/11/22 00:26:29]

nit: Looks like this can fit on the previous line.

[jif-google, 2013/11/22 12:21:44]

Done.

   virtual ~MockAutofillExternalDelegate() {}
 
   virtual void DidSelectSuggestion(int identifier) OVERRIDE {}
   virtual void RemoveSuggestion(const string16& value, int identifier) OVERRIDE
       {}
   virtual void ClearPreviewedForm() OVERRIDE {}
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr() {
     return AutofillExternalDelegate::GetWeakPtr();
   }
 };
@@ skipping 81 matching lines @@
 
     AutofillDriverImpl::CreateForWebContentsAndDelegate(
         web_contents(),
         manager_delegate_.get(),
         "en-US",
         AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
     AutofillDriverImpl* driver =
         AutofillDriverImpl::FromWebContents(web_contents());
     external_delegate_.reset(
         new NiceMock<MockAutofillExternalDelegate>(
-            web_contents(),
             driver->autofill_manager(),
             driver));
 
     autofill_popup_controller_ =
         new testing::NiceMock<TestAutofillPopupController>(
             external_delegate_->GetWeakPtr(),gfx::Rect());
   }
 
   virtual void TearDown() OVERRIDE {
     // This will make sure the controller and the view (if any) are both
@@ skipping 269 matching lines @@
   // Clear datalist values and check that the popup becomes hidden.
   EXPECT_CALL(*autofill_popup_controller_, Hide());
   data_list_values.clear();
   autofill_popup_controller_->UpdateDataListValues(data_list_values,
                                                    data_list_values);
 }
 
 TEST_F(AutofillPopupControllerUnitTest, GetOrCreate) {
   AutofillDriverImpl* driver =
       AutofillDriverImpl::FromWebContents(web_contents());
-  MockAutofillExternalDelegate delegate(
-      web_contents(), driver->autofill_manager(), driver);
+  MockAutofillExternalDelegate delegate(driver->autofill_manager(), driver);
 
   WeakPtr<AutofillPopupControllerImpl> controller =
       AutofillPopupControllerImpl::GetOrCreate(
           WeakPtr<AutofillPopupControllerImpl>(), delegate.GetWeakPtr(),
           NULL, NULL, gfx::Rect(), base::i18n::UNKNOWN_DIRECTION);
   EXPECT_TRUE(controller.get());
 
   controller->Hide();
 
   controller = AutofillPopupControllerImpl::GetOrCreate(
@@ skipping 141 matching lines @@
   element_bounds.push_back(
       gfx::RectF(desired_width * 1.5, desired_height * 1.5, 0, 0));
   expected_popup_bounds.push_back(
       gfx::Rect((desired_width + 1) / 2, (desired_height + 1) / 2,
                 desired_width, desired_height));
 
   for (size_t i = 0; i < element_bounds.size(); ++i) {
     AutofillDriverImpl* driver =
         AutofillDriverImpl::FromWebContents(web_contents());
     NiceMock<MockAutofillExternalDelegate> external_delegate(
-        web_contents(), driver->autofill_manager(), driver);
+        driver->autofill_manager(), driver);
     TestAutofillPopupController* autofill_popup_controller =
         new TestAutofillPopupController(external_delegate.GetWeakPtr(),
                                         element_bounds[i]);
 
     autofill_popup_controller->set_display(display);
     autofill_popup_controller->Show(names, names, names, autofill_ids);
 
     EXPECT_EQ(expected_popup_bounds[i].ToString(),
               autofill_popup_controller->popup_bounds().ToString()) <<
         "Popup bounds failed to match for test " << i;
 
     // Hide the controller to delete it.
     autofill_popup_controller->DoHide();
   }
 }
 
 }  // namespace autofill