Group forms-related files in webkit/glue in a forms/ subdirectory.

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 21 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
-#include "webkit/glue/form_data.h"
-#include "webkit/glue/form_field.h"
+#include "webkit/forms/form_data.h"
+#include "webkit/forms/form_field.h"
 
 using content::BrowserThread;
 using testing::_;
-using webkit_glue::FormData;
-using webkit_glue::FormField;
+using webkit::forms::FormData;
+using webkit::forms::FormField;
 
 namespace {
 
 // The page ID sent to the AutofillManager from the RenderView, used to send
 // an IPC message back to the renderer.
 const int kDefaultPageID = 137;
 
 typedef Tuple5<int,
                std::vector<string16>,
                std::vector<string16>,
@@ skipping 203 matching lines @@
     EXPECT_EQ(expected_labels[i], labels[i]);
     EXPECT_EQ(expected_icons[i], icons[i]);
     EXPECT_EQ(expected_unique_ids[i], unique_ids[i]);
   }
 }
 
 void ExpectFilledField(const char* expected_label,
                        const char* expected_name,
                        const char* expected_value,
                        const char* expected_form_control_type,
-                       const webkit_glue::FormField& field) {
+                       const webkit::forms::FormField& field) {
   SCOPED_TRACE(expected_label);
   EXPECT_EQ(UTF8ToUTF16(expected_label), field.label);
   EXPECT_EQ(UTF8ToUTF16(expected_name), field.name);
   EXPECT_EQ(UTF8ToUTF16(expected_value), field.value);
   EXPECT_EQ(UTF8ToUTF16(expected_form_control_type), field.form_control_type);
 }
 
 // Verifies that the |filled_form| has been filled with the given data.
 // Verifies address fields if |has_address_fields| is true, and verifies
 // credit card fields if |has_credit_card_fields| is true. Verifies both if both
@@ skipping 276 matching lines @@
 
     file_thread_.Start();
   }
 
   virtual void TearDown() OVERRIDE {
     file_thread_.Stop();
     TabContentsWrapperTestHarness::TearDown();
   }
 
   void GetAutofillSuggestions(int query_id,
-                              const webkit_glue::FormData& form,
-                              const webkit_glue::FormField& field) {
+                              const webkit::forms::FormData& form,
+                              const webkit::forms::FormField& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
                                                 gfx::Rect(),
                                                 false);
   }
 
-  void GetAutofillSuggestions(const webkit_glue::FormData& form,
-                              const webkit_glue::FormField& field) {
+  void GetAutofillSuggestions(const webkit::forms::FormData& form,
+                              const webkit::forms::FormField& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
   void AutocompleteSuggestionsReturned(const std::vector<string16>& result) {
     contents_wrapper()->autocomplete_history_manager()->
         SendSuggestions(&result);
   }
 
-  void FormsSeen(const std::vector<webkit_glue::FormData>& forms) {
+  void FormsSeen(const std::vector<webkit::forms::FormData>& forms) {
     autofill_manager_->OnFormsSeen(forms, base::TimeTicks());
   }
 
   void FormSubmitted(const FormData& form) {
     if (autofill_manager_->OnFormSubmitted(form, base::TimeTicks::Now()))
       autofill_manager_->WaitForAsyncFormSubmit();
   }
 
   void FillAutofillFormData(int query_id,
-                            const webkit_glue::FormData& form,
-                            const webkit_glue::FormField& field,
+                            const webkit::forms::FormData& form,
+                            const webkit::forms::FormField& field,
                             int unique_id) {
     autofill_manager_->OnFillAutofillFormData(query_id, form, field, unique_id);
   }
 
   int PackGUIDs(const GUIDPair& cc_guid, const GUIDPair& profile_guid) const {
     return autofill_manager_->PackGUIDs(cc_guid, profile_guid);
   }
 
   bool GetAutofillSuggestionsMessage(int* page_id,
                                      std::vector<string16>* values,
@@ skipping 2252 matching lines @@
 
 namespace {
 
 class MockAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   explicit MockAutofillExternalDelegate(TabContentsWrapper* wrapper)
       : AutofillExternalDelegate(wrapper) {}
   virtual ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD5(OnQuery, void(int query_id,
-                             const webkit_glue::FormData& form,
-                             const webkit_glue::FormField& field,
+                             const webkit::forms::FormData& form,
+                             const webkit::forms::FormField& field,
                              const gfx::Rect& bounds,
                              bool display_warning));
 
   virtual void HideAutofillPopup() OVERRIDE {}
 
   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,
       int separator_index) OVERRIDE {}
 
   virtual void OnQueryPlatformSpecific(
       int query_id,
-      const webkit_glue::FormData& form,
-      const webkit_glue::FormField& field) OVERRIDE {}
+      const webkit::forms::FormData& form,
+      const webkit::forms::FormField& field) OVERRIDE {}
 
  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());
@@ skipping 27 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