Move forms/ out of webkit/.

chrome/browser/autofill/autocomplete_history_manager.cc

 // 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.
 
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/prefs/pref_service_base.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/common/autofill_messages.h"
+#include "chrome/common/form_data.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "webkit/forms/form_data.h"
 
 using base::StringPiece16;
 using content::BrowserContext;
 using content::WebContents;
-using webkit::forms::FormData;
-using webkit::forms::FormField;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(AutocompleteHistoryManager)
 
 namespace {
 
 // Limit on the number of suggestions to appear in the pop-up menu under an
 // text input element in a form.
 const int kMaxAutocompleteMenuItems = 6;
 
 // The separator characters for SSNs.
@@ skipping 54 matching lines @@
   if (!base::StringToInt(StringPiece16(number_string.begin() + 5,
                                        number_string.begin() + 9),
                          &serial)
       || serial == 0) {
     return false;
   }
 
   return true;
 }
 
-bool IsTextField(const FormField& field) {
+bool IsTextField(const FormFieldData& field) {
   return
       field.form_control_type == ASCIIToUTF16("text") ||
       field.form_control_type == ASCIIToUTF16("search") ||
       field.form_control_type == ASCIIToUTF16("tel") ||
       field.form_control_type == ASCIIToUTF16("url") ||
       field.form_control_type == ASCIIToUTF16("email") ||
       field.form_control_type == ASCIIToUTF16("text");
 }
 
 }  // namespace
@@ skipping 90 matching lines @@
   // Don't save data that was submitted through JavaScript.
   if (!form.user_submitted)
     return;
 
   // We put the following restriction on stored FormFields:
   //  - non-empty name
   //  - non-empty value
   //  - text field
   //  - value is not a credit card number
   //  - value is not a SSN
-  std::vector<FormField> values;
-  for (std::vector<FormField>::const_iterator iter =
+  std::vector<FormFieldData> values;
+  for (std::vector<FormFieldData>::const_iterator iter =
            form.fields.begin();
        iter != form.fields.end(); ++iter) {
     if (!iter->value.empty() &&
         !iter->name.empty() &&
         IsTextField(*iter) &&
         !CreditCard::IsValidCreditCardNumber(iter->value) &&
         !IsSSN(iter->value)) {
       values.push_back(*iter);
     }
   }
@@ skipping 75 matching lines @@
                                              autofill_icons_,
                                              autofill_unique_ids_));
   }
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }