Group forms-related files in webkit/glue in a forms/ subdirectory.

chrome/browser/webdata/autofill_table.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_WEBDATA_AUTOFILL_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/webdata/web_database_table.h"
 
 #include <vector>
 
 class AutofillChange;
 class AutofillEntry;
 class AutofillProfile;
 class AutofillTableTest;
 class CreditCard;
 
 namespace base {
 class Time;
 }
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct FormField;
 }
+}
 
 // This class manages the various autofill tables within the SQLite database
 // passed to the constructor. It expects the following schemas:
 //
 // Note: The database stores time in seconds, UTC.
 //
 // autofill
 //   name                The name of the input as specified in the html.
 //   value               The literal contents of the text field.
 //   value_lower         The contents of the text field made lower_case.
@@ skipping 79 matching lines @@
 class AutofillTable : public WebDatabaseTable {
  public:
   AutofillTable(sql::Connection* db, sql::MetaTable* meta_table);
   virtual ~AutofillTable();
   virtual bool Init() OVERRIDE;
   virtual bool IsSyncable() OVERRIDE;
 
   // Records the form elements in |elements| in the database in the
   // autofill table.  A list of all added and updated autofill entries
   // is returned in the changes out parameter.
-  bool AddFormFieldValues(const std::vector<webkit_glue::FormField>& elements,
+  bool AddFormFieldValues(const std::vector<webkit::forms::FormField>& elements,
                           std::vector<AutofillChange>* changes);
 
   // Records a single form element in the database in the autofill table. A list
   // of all added and updated autofill entries is returned in the changes out
   // parameter.
-  bool AddFormFieldValue(const webkit_glue::FormField& element,
+  bool AddFormFieldValue(const webkit::forms::FormField& element,
                          std::vector<AutofillChange>* changes);
 
   // Retrieves a vector of all values which have been recorded in the autofill
   // table as the value in a form element with name |name| and which start with
   // |prefix|.  The comparison of the prefix is case insensitive.
   bool GetFormValuesForElementName(const string16& name,
                                    const string16& prefix,
                                    std::vector<string16>* values,
                                    int limit);
 
@@ skipping 15 matching lines @@
                                      int* how_many);
 
   // Increments the count in the row corresponding to |pair_id| by
   // |delta|.  Removes the row from the table and sets the
   // |was_removed| out parameter to true if the count becomes 0.
   bool AddToCountOfFormElement(int64 pair_id, int delta, bool* was_removed);
 
   // Gets the pair_id and count entries from name and value specified in
   // |element|.  Sets *pair_id and *count to 0 if there is no such row in
   // the table.
-  bool GetIDAndCountOfFormElement(const webkit_glue::FormField& element,
+  bool GetIDAndCountOfFormElement(const webkit::forms::FormField& element,
                                   int64* pair_id,
                                   int* count);
 
   // Gets the count only given the pair_id.
   bool GetCountOfFormElement(int64 pair_id, int* count);
 
   // Updates the count entry in the row corresponding to |pair_id| to |count|.
   bool SetCountOfFormElement(int64 pair_id, int count);
 
   // Adds a new row to the autofill table with name and value given in
   // |element|.  Sets *pair_id to the pair_id of the new row.
-  bool InsertFormElement(const webkit_glue::FormField& element, int64* pair_id);
+  bool InsertFormElement(const webkit::forms::FormField& element,
+                         int64* pair_id);
 
   // Adds a new row to the autofill_dates table.
   bool InsertPairIDAndDate(int64 pair_id, const base::Time& date_created);
 
   // Removes row from the autofill tables given |pair_id|.
   bool RemoveFormElementForID(int64 pair_id);
 
   // Removes row from the autofill tables for the given |name| |value| pair.
   virtual bool RemoveFormElement(const string16& name, const string16& value);
 
@@ skipping 108 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest,
                            Autofill_GetAllAutofillEntries_OneResult);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest,
                            Autofill_GetAllAutofillEntries_TwoDistinct);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest,
                            Autofill_GetAllAutofillEntries_TwoSame);
 
   // Methods for adding autofill entries at a specified time.  For
   // testing only.
   bool AddFormFieldValuesTime(
-      const std::vector<webkit_glue::FormField>& elements,
+      const std::vector<webkit::forms::FormField>& elements,
       std::vector<AutofillChange>* changes,
       base::Time time);
-  bool AddFormFieldValueTime(const webkit_glue::FormField& element,
+  bool AddFormFieldValueTime(const webkit::forms::FormField& element,
                              std::vector<AutofillChange>* changes,
                              base::Time time);
 
   // Insert a single AutofillEntry into the autofill/autofill_dates tables.
   bool InsertAutofillEntry(const AutofillEntry& entry);
 
   // Checks if the trash is empty.
   bool IsAutofillProfilesTrashEmpty();
 
   // Checks if the guid is in the trash.
   bool IsAutofillGUIDInTrash(const std::string& guid);
 
   bool InitMainTable();
   bool InitCreditCardsTable();
   bool InitDatesTable();
   bool InitProfilesTable();
   bool InitProfileNamesTable();
   bool InitProfileEmailsTable();
   bool InitProfilePhonesTable();
   bool InitProfileTrashTable();
 
   DISALLOW_COPY_AND_ASSIGN(AutofillTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_TABLE_H_