Move forms/ out of webkit/.

chrome/browser/autofill/form_structure.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_FORM_STRUCTURE_H_
 #define CHROME_BROWSER_AUTOFILL_FORM_STRUCTURE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "googleurl/src/gurl.h"
 
+struct FormData;
+struct FormDataPredictions;
 
 enum RequestMethod {
   GET,
   POST
 };
 
 enum UploadRequired {
   UPLOAD_NOT_REQUIRED,
   UPLOAD_REQUIRED,
   USE_UPLOAD_RATES
 };
 
 class AutofillMetrics;
 
 namespace base {
 class TimeTicks;
 }
 
 namespace buzz {
 class XmlElement;
 }
 
-namespace webkit {
-namespace forms {
-struct FormData;
-struct FormDataPredictions;
-}
-}
-
 // FormStructure stores a single HTML form together with the values entered
 // in the fields along with additional information needed by Autofill.
 class FormStructure {
  public:
-  explicit FormStructure(const webkit::forms::FormData& form);
+  explicit FormStructure(const FormData& form);
   virtual ~FormStructure();
 
   // Runs several heuristics against the form fields to determine their possible
   // types.
   void DetermineHeuristicTypes();
 
   // Encodes the XML upload request from this FormStructure.
   bool EncodeUploadRequest(const FieldTypeSet& available_field_types,
                            bool form_was_autofilled,
                            std::string* encoded_xml) const;
@@ skipping 10 matching lines @@
   // Parses the field types from the server query response. |forms| must be the
   // same as the one passed to EncodeQueryRequest when constructing the query.
   static void ParseQueryResponse(const std::string& response_xml,
                                  const std::vector<FormStructure*>& forms,
                                  const AutofillMetrics& metric_logger);
 
   // Fills |forms| with the details from the given |form_structures| and their
   // fields' predicted types.
   static void GetFieldTypePredictions(
       const std::vector<FormStructure*>& form_structures,
-      std::vector<webkit::forms::FormDataPredictions>* forms);
+      std::vector<FormDataPredictions>* forms);
 
   // The unique signature for this form, composed of the target url domain,
   // the form name, and the form field names in a 64-bit hash.
   std::string FormSignature() const;
 
   // Runs a quick heuristic to rule out forms that are obviously not
   // auto-fillable, like google/yahoo/msn search, etc. The requirement that the
   // form's method be POST is only applied if |require_method_post| is true.
   bool IsAutofillable(bool require_method_post) const;
 
@@ skipping 40 matching lines @@
   std::vector<AutofillField*>::const_iterator end() const {
     return fields_.end();
   }
 
   const GURL& source_url() const { return source_url_; }
 
   UploadRequired upload_required() const { return upload_required_; }
 
   virtual std::string server_experiment_id() const;
 
-  bool operator==(const webkit::forms::FormData& form) const;
-  bool operator!=(const webkit::forms::FormData& form) const;
+  bool operator==(const FormData& form) const;
+  bool operator!=(const FormData& form) const;
 
  private:
   friend class FormStructureTest;
   FRIEND_TEST_ALL_PREFIXES(AutofillDownloadTest, QueryAndUploadTest);
   // 64-bit hash of the string - used in FormSignature and unit-tests.
   static std::string Hash64Bit(const std::string& str);
 
   enum EncodeRequestType {
     QUERY,
     UPLOAD,
@@ skipping 53 matching lines @@
   RequestMethod method_;
 
   // Whether the form includes any field types explicitly specified by the site
   // author, via the |autocompletetype| attribute.
   bool has_author_specified_types_;
 
   DISALLOW_COPY_AND_ASSIGN(FormStructure);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_FORM_STRUCTURE_H_