Don't store empty values for autofill

chrome/browser/webdata/web_database.h

 // Copyright (c) 2006-2008 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_WEB_DATABASE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATABASE_H__
 
 #include <string>
 #include <vector>
 
@@ skipping 129 matching lines @@
 
   // Removes rows from autofill_dates if they were created on or after
   // |delete_begin| and strictly before |delete_end|.  Decrements the count of
   // the corresponding rows in the autofill table, and removes those rows if the
   // count goes to 0.
   bool RemoveFormElementsAddedBetween(const base::Time delete_begin,
                                       const base::Time delete_end);
 
   // Removes from autofill_dates rows with given pair_id where date_created lies
   // between delte_begin and delte_end.
-  bool RemovePairIDAndDate(int64 pair_id,
-                           const base::Time delete_begin,
-                           const base::Time delete_end,
-                           int* how_many);
+  bool RemoveFormElementForTimeRange(int64 pair_id,
+                                     const base::Time delete_begin,
+                                     const base::Time delete_end,
+                                     int* how_many);
 
   // Increments the count in the row corresponding to |pair_id| by |delta|.
   // Removes the row from the table if the count becomes 0.
   bool AddToCountOfFormElement(int64 pair_id, int delta);
 
   // Gets the pair_id and count entries from name and value specified in
   // |element|.  Sets *count to 0 if there is no such row in the table.
   bool GetIDAndCountOfFormElement(const AutofillForm::Element& 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 AutofillForm::Element& 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 table given |pair_id|.
+  // Removes row from the autofill tables given |pair_id|.
   bool RemoveFormElement(int64 pair_id);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Apps
   //
   //////////////////////////////////////////////////////////////////////////////
 
   bool SetWebAppImage(const GURL& url, const SkBitmap& image);
   bool GetWebAppImages(const GURL& url, std::vector<SkBitmap>* images);
 
   bool SetWebAppHasAllImages(const GURL& url, bool has_all_images);
   bool GetWebAppHasAllImages(const GURL& url);
 
   bool RemoveWebApp(const GURL& url);
 
  private:
-  friend class WebDatabaseTest;
+  FRIEND_TEST(WebDatabaseTest, Autofill);
+
+  // Removes empty values for autofill that were incorrectly stored in the DB
+  // (see bug http://crbug.com/6111).
+  // TODO(jcampan): http://crbug.com/7564 remove when we think all users have
+  //                run this code.
+  bool ClearAutofillEmptyValueElements();
 
   bool InitKeywordsTable();
   bool InitLoginsTable();
   bool InitAutofillTable();
   bool InitAutofillDatesTable();
   bool InitWebAppIconsTable();
   bool InitWebAppsTable();
 
   void MigrateOldVersionsAsNeeded();
 
   sqlite3* db_;
   int transaction_nesting_;
   MetaTableHelper meta_table_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDatabase);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATABASE_H__