Moving AutofillAgent Logic into Browser

chrome/browser/autofill/autofill_manager_unittest.cc

Index: chrome/browser/autofill/autofill_manager_unittest.cc
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index aac5a7a6942f3545b8536220725b82a1be48870e..f9e627d1d8320436625f8d4f055b2b0f2a06b81c 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -567,7 +567,7 @@ class AutofillManagerTest : public TabContentsWrapperTestHarness {
   void GetAutofillSuggestions(int query_id,
                               const webkit_glue::FormData& form,
                               const webkit_glue::FormField& field) {
-    autofill_manager_->OnQueryFormFieldAutofill(query_id, form, field);
+    autofill_manager_->OnQueryFormFieldAutofill(query_id, form, field, false);
   }
 
   void GetAutofillSuggestions(const webkit_glue::FormData& form,
@@ -2863,15 +2863,16 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
       : AutofillExternalDelegate(wrapper) {}
   virtual ~MockAutofillExternalDelegate() {}
 
-  MOCK_METHOD3(OnQuery, void(int query_id,
+  MOCK_METHOD4(OnQuery, void(int query_id,
                              const webkit_glue::FormData& form,
-                             const webkit_glue::FormField& field));
-  virtual void OnSuggestionsReturned(
-      int query_id,
+                             const webkit_glue::FormField& field,
+                             bool display_warning));
+  virtual void ApplyAutofillSuggestions(
       const std::vector<string16>& autofill_values,
       const std::vector<string16>& autofill_labels,
       const std::vector<string16>& autofill_icons,
-      const std::vector<int>& autofill_unique_ids) {}
+      const std::vector<int>& autofill_unique_ids,
+      int separator_index) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillExternalDelegate);
@@ -2882,7 +2883,7 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
 // Test our external delegate is called at the right time.
 TEST_F(AutofillManagerTest, TestExternalDelegate) {
   MockAutofillExternalDelegate external_delegate(contents_wrapper());
-  EXPECT_CALL(external_delegate, OnQuery(_, _, _));
+  EXPECT_CALL(external_delegate, OnQuery(_, _, _, _));
   autofill_manager_->SetExternalDelegate(&external_delegate);
 
   FormData form;