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

chrome/browser/sync/test/integration/autofill_helper.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 "chrome/browser/sync/test/integration/autofill_helper.h"
 
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
+#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/thread_observer_helper.h"
-#include "webkit/glue/form_field.h"
+#include "webkit/forms/form_field.h"
 
 using base::WaitableEvent;
 using content::BrowserThread;
 using sync_datatype_helper::test;
 using testing::_;
 
 namespace {
 
 class GetAllAutofillEntries
     : public base::RefCountedThreadSafe<GetAllAutofillEntries> {
@@ skipping 92 matching lines @@
 
 WebDataService* GetWebDataService(int index) {
   return test()->GetProfile(index)->GetWebDataService(Profile::EXPLICIT_ACCESS);
 }
 
 PersonalDataManager* GetPersonalDataManager(int index) {
   return PersonalDataManagerFactory::GetForProfile(test()->GetProfile(index));
 }
 
 void AddKeys(int profile, const std::set<AutofillKey>& keys) {
-  std::vector<webkit_glue::FormField> form_fields;
+  std::vector<webkit::forms::FormField> form_fields;
   for (std::set<AutofillKey>::const_iterator i = keys.begin();
        i != keys.end();
        ++i) {
-    webkit_glue::FormField field;
+    webkit::forms::FormField field;
     field.name = i->name();
     field.value = i->value();
     form_fields.push_back(field);
   }
 
   WaitableEvent done_event(false, false);
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper(
       new AutofillDBThreadObserverHelper());
   observer_helper->Init();
 
@@ skipping 140 matching lines @@
     if (!ProfilesMatch(0, i)) {
       LOG(ERROR) << "Profile " << i << "does not contain the same autofill "
                                        "profiles as profile 0.";
       return false;
     }
   }
   return true;
 }
 
 }  // namespace autofill_helper