Move forms/ out of webkit/.

chrome/browser/webdata/autofill_table.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/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/tuple.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
+#include "chrome/common/form_field_data.h"
 #include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/forms/form_field.h"
 
 using base::Time;
-using webkit::forms::FormField;
 
 namespace {
 
 typedef std::vector<Tuple3<int64, string16, string16> > AutofillElementList;
 
 // TODO(dhollowa): Find a common place for this.  It is duplicated in
 // personal_data_manager.cc.
 template<typename T>
 T* address_of(T& v) {
   return &v;
@@ skipping 292 matching lines @@
  return (InitMainTable() && InitCreditCardsTable() && InitDatesTable() &&
      InitProfilesTable() && InitProfileNamesTable() &&
      InitProfileEmailsTable() && InitProfilePhonesTable() &&
      InitProfileTrashTable());
 }
 
 bool AutofillTable::IsSyncable() {
   return true;
 }
 
-bool AutofillTable::AddFormFieldValues(const std::vector<FormField>& elements,
-                                       std::vector<AutofillChange>* changes) {
+bool AutofillTable::AddFormFieldValues(
+    const std::vector<FormFieldData>& elements,
+    std::vector<AutofillChange>* changes) {
   return AddFormFieldValuesTime(elements, changes, Time::Now());
 }
 
-bool AutofillTable::AddFormFieldValue(const FormField& element,
+bool AutofillTable::AddFormFieldValue(const FormFieldData& element,
                                       std::vector<AutofillChange>* changes) {
   return AddFormFieldValueTime(element, changes, Time::Now());
 }
 
 bool AutofillTable::GetFormValuesForElementName(const string16& name,
                                                 const string16& prefix,
                                                 std::vector<string16>* values,
                                                 int limit) {
   DCHECK(values);
   sql::Statement s;
@@ skipping 197 matching lines @@
     NOTREACHED();
     return false;
   } else {
     if (!SetCountOfFormElement(pair_id, count + delta))
       return false;
   }
   return true;
 }
 
 bool AutofillTable::GetIDAndCountOfFormElement(
-    const FormField& element,
+    const FormFieldData& element,
     int64* pair_id,
     int* count) {
   DCHECK(pair_id);
   DCHECK(count);
 
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT pair_id, count FROM autofill "
       "WHERE name = ? AND value = ?"));
   s.BindString16(0, element.name);
   s.BindString16(1, element.value);
@@ skipping 27 matching lines @@
 
 bool AutofillTable::SetCountOfFormElement(int64 pair_id, int count) {
   sql::Statement s(db_->GetUniqueStatement(
       "UPDATE autofill SET count = ? WHERE pair_id = ?"));
   s.BindInt(0, count);
   s.BindInt64(1, pair_id);
 
   return s.Run();
 }
 
-bool AutofillTable::InsertFormElement(const FormField& element,
+bool AutofillTable::InsertFormElement(const FormFieldData& element,
                                       int64* pair_id) {
   DCHECK(pair_id);
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT INTO autofill (name, value, value_lower) VALUES (?,?,?)"));
   s.BindString16(0, element.name);
   s.BindString16(1, element.value);
   s.BindString16(2, base::i18n::ToLower(element.value));
 
   if (!s.Run())
     return false;
@@ skipping 20 matching lines @@
       "DELETE FROM autofill_dates WHERE pair_id = ? and date_created IN "
       "(SELECT date_created FROM autofill_dates WHERE pair_id = ? "
       "ORDER BY date_created DESC LIMIT 1)"));
   s.BindInt64(0, pair_id);
   s.BindInt64(1, pair_id);
 
   return s.Run();
 }
 
 bool AutofillTable::AddFormFieldValuesTime(
-    const std::vector<FormField>& elements,
+    const std::vector<FormFieldData>& elements,
     std::vector<AutofillChange>* changes,
     Time time) {
   // Only add one new entry for each unique element name.  Use |seen_names| to
   // track this.  Add up to |kMaximumUniqueNames| unique entries per form.
   const size_t kMaximumUniqueNames = 256;
   std::set<string16> seen_names;
   bool result = true;
-  for (std::vector<FormField>::const_iterator itr = elements.begin();
+  for (std::vector<FormFieldData>::const_iterator itr = elements.begin();
        itr != elements.end(); ++itr) {
     if (seen_names.size() >= kMaximumUniqueNames)
       break;
     if (seen_names.find(itr->name) != seen_names.end())
       continue;
     result = result && AddFormFieldValueTime(*itr, changes, time);
     seen_names.insert(itr->name);
   }
   return result;
 }
@@ skipping 134 matching lines @@
 
   int64 pair_id = db_->GetLastInsertRowId();
   for (size_t i = 0; i < entry.timestamps().size(); i++) {
     if (!InsertPairIDAndDate(pair_id, entry.timestamps()[i]))
       return false;
   }
 
   return true;
 }
 
-bool AutofillTable::AddFormFieldValueTime(const FormField& element,
+bool AutofillTable::AddFormFieldValueTime(const FormFieldData& element,
                                           std::vector<AutofillChange>* changes,
                                           Time time) {
   int count = 0;
   int64 pair_id;
 
   if (!GetIDAndCountOfFormElement(element, &pair_id, &count))
     return false;
 
   if (count == 0 && !InsertFormElement(element, &pair_id))
     return false;
@@ skipping 1146 matching lines @@
         "WHERE guid=?"));
     s_date.BindInt64(0, date_item->second);
     s_date.BindString(1, iter->guid());
 
     if (!s_date.Run())
       return false;
   }
 
   return true;
 }