Move forms/ out of webkit/.

chrome/browser/autofill/autofill_field.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/autofill/autofill_field.h"
 
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 }
 
 }  // namespace
 
 AutofillField::AutofillField()
     : server_type_(NO_SERVER_DATA),
       heuristic_type_(UNKNOWN_TYPE),
       phone_part_(IGNORED) {
 }
 
-AutofillField::AutofillField(const webkit::forms::FormField& field,
+AutofillField::AutofillField(const FormFieldData& field,
                              const string16& unique_name)
-    : webkit::forms::FormField(field),
+    : FormFieldData(field),
       unique_name_(unique_name),
       server_type_(NO_SERVER_DATA),
       heuristic_type_(UNKNOWN_TYPE),
       phone_part_(IGNORED) {
 }
 
 AutofillField::~AutofillField() {}
 
 void AutofillField::set_heuristic_type(AutofillFieldType type) {
   if (type >= 0 && type < MAX_VALID_FIELD_TYPE) {
@@ skipping 28 matching lines @@
 std::string AutofillField::FieldSignature() const {
   std::string field_name = UTF16ToUTF8(name);
   std::string type = UTF16ToUTF8(form_control_type);
   std::string field_string = field_name + "&" + type;
   return Hash32Bit(field_string);
 }
 
 bool AutofillField::IsFieldFillable() const {
   return type() != UNKNOWN_TYPE;
 }