Moving AutofillAgent Logic into Browser

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
@@ skipping 549 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     file_thread_.Stop();
     TabContentsWrapperTestHarness::TearDown();
   }
 
   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,
                               const webkit_glue::FormField& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
   void AutocompleteSuggestionsReturned(const std::vector<string16>& result) {
     contents_wrapper()->autocomplete_history_manager()->
         SendSuggestions(&result);
@@ skipping 2275 matching lines @@
 }
 
 namespace {
 
 class MockAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   explicit MockAutofillExternalDelegate(TabContentsWrapper* wrapper)
       : 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);
 };
 
 }  // namespace
 
 // 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;
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormField& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   autofill_manager_->SetExternalDelegate(NULL);
@@ skipping 16 matching lines @@
 
   AutofillManager* autofill_manager = contents_wrapper()->autofill_manager();
   EXPECT_TRUE(autofill_manager->external_delegate());
 
   AutocompleteHistoryManager* autocomplete_history_manager =
       contents_wrapper()->autocomplete_history_manager();
   EXPECT_TRUE(autocomplete_history_manager->external_delegate());
 }
 
 #endif  // OS_ANDROID