Move forms/ out of webkit/.

chrome/browser/webdata/web_data_service.h

 // 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
@@ skipping 357 matching lines @@
 #endif  // defined(OS_WIN)
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Autofill.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   // AutofillWebData implementation.
   virtual void AddFormFields(
-      const std::vector<webkit::forms::FormField>& fields) OVERRIDE;
+      const std::vector<content::FormField>& fields) OVERRIDE;
   virtual Handle GetFormValuesForElementName(
       const string16& name,
       const string16& prefix,
       int limit,
       WebDataServiceConsumer* consumer) OVERRIDE;
   virtual void RemoveExpiredFormElements() OVERRIDE;
   virtual void RemoveFormValueForElementName(const string16& name,
                                              const string16& value) OVERRIDE;
   virtual void AddAutofillProfile(const AutofillProfile& profile) OVERRIDE;
   virtual void UpdateAutofillProfile(const AutofillProfile& profile) OVERRIDE;
@@ skipping 154 matching lines @@
   void RemoveIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
   void GetIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
 #endif  // defined(OS_WIN)
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Autofill.
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddFormElementsImpl(
-      GenericRequest<std::vector<webkit::forms::FormField> >* request);
+      GenericRequest<std::vector<content::FormField> >* request);
   void GetFormValuesForElementNameImpl(WebDataRequest* request,
       const string16& name, const string16& prefix, int limit);
   void RemoveFormElementsAddedBetweenImpl(
       GenericRequest2<base::Time, base::Time>* request);
   void RemoveExpiredFormElementsImpl(WebDataRequest* request);
   void RemoveFormValueForElementNameImpl(
       GenericRequest2<string16, string16>* request);
   void AddAutofillProfileImpl(GenericRequest<AutofillProfile>* request);
   void UpdateAutofillProfileImpl(GenericRequest<AutofillProfile>* request);
   void RemoveAutofillProfileImpl(GenericRequest<std::string>* request);
@@ skipping 40 matching lines @@
   typedef std::map<Handle, WebDataRequest*> RequestMap;
   RequestMap pending_requests_;
 
   // MessageLoop the WebDataService is created on.
   MessageLoop* main_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__