Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 42 insertions, 2 deletions

diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 9358533..e7fd295 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -228,15 +228,29 @@ class WebDatabase {
 
   // Removes a row from the autofill_profiles table.  |profile_id| is the
   // unique ID of the profile to remove.
+  // DEPRECATED: In favor of |RemoveAutoFillProfile(const std::string& guid)|.
+  // TODO(dhollowa): Remove unique IDs.  http://crbug.com/58813
   virtual bool RemoveAutoFillProfile(int profile_id);
 
+  // Removes a row from the autofill_profiles table.  |guid| is the identifier
+  // of the profile to remove.
+  virtual bool RemoveAutoFillProfile(const std::string& guid);
+
   // Retrieves profile for unique id |profile_id|, owned by caller.
+  // DEPRECATED: In favor of |GetAutoFillProfileForGUID(...)|.
+  // TODO(dhollowa): Remove unique IDs.  http://crbug.com/58813
   bool GetAutoFillProfileForID(int profile_id, AutoFillProfile** profile);
 
   // Retrieves a profile with label |label|.  The caller owns |profile|.
+  // DEPRECATED: In favor of |GetAutoFillProfileForGUID(...)|.
+  // TODO(dhollowa): Remove labels.  http://crbug.com/58813
   bool GetAutoFillProfileForLabel(const string16& label,
                                   AutoFillProfile** profile);
 
+  // Retrieves a profile with guid |guid|.  The caller owns |profile|.
+  bool GetAutoFillProfileForGUID(const std::string& guid,
+                                 AutoFillProfile** profile);
+
   // Retrieves all profiles in the database.  Caller owns the returned profiles.
   virtual bool GetAutoFillProfiles(std::vector<AutoFillProfile*>* profiles);
 
@@ -248,20 +262,40 @@ class WebDatabase {
 
   // Removes a row from the credit_cards table.  |credit_card_id| is the
   // unique ID of the credit card to remove.
+  // DEPRECATED: In favor of |RemoveCreditCard(const std::string& guid)|.
+  // TODO(dhollowa): Remove unique IDs.  http://crbug.com/58813
   bool RemoveCreditCard(int credit_card_id);
 
+  // Removes a row from the credit_cards table.  |guid| is the identifer  of the
+  // credit card to remove.
+  bool RemoveCreditCard(const std::string& guid);
+
   // Retrieves a credit card with label |label|.  The caller owns
   // |credit_card_id|.
+  // DEPRECATED: In favor of |GetCreditCardForGUID()|.
+  // TODO(dhollowa): Remove labels.  http://crbug.com/58813
   bool GetCreditCardForLabel(const string16& label,
-                                  CreditCard** credit_card);
+                             CreditCard** credit_card);
 
   // Retrieves credit card for a card with unique id |credit_card_id|.
+  // DEPRECATED: In favor of |GetCreditCardForGUID()|.
+  // TODO(dhollowa): Remove unique IDs.  http://crbug.com/58813
   bool GetCreditCardForID(int credit_card_id, CreditCard** credit_card);
 
+  // Retrieves a credit card with guid |guid|.  The caller owns
+  // |credit_card_id|.
+  bool GetCreditCardForGUID(const std::string& guid, CreditCard** credit_card);
+
   // Retrieves all credit cards in the database.  Caller owns the returned
   // credit cards.
   virtual bool GetCreditCards(std::vector<CreditCard*>* credit_cards);
 
+  // Removes rows from autofill_profiles and credit_cards if they were created
+  // on or after |delete_begin| and strictly before |delete_end|.
+  bool RemoveAutoFillProfilesAndCreditCardsModifiedBetween(
+      base::Time delete_begin,
+      base::Time delete_end);
+
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Apps
@@ -308,6 +342,10 @@ class WebDatabase {
                            Autofill_GetAllAutofillEntries_TwoSame);
   FRIEND_TEST_ALL_PREFIXES(WebDatabaseTest, Autofill_UpdateDontReplace);
   FRIEND_TEST_ALL_PREFIXES(WebDatabaseTest, Autofill_AddFormFieldValues);
+  FRIEND_TEST_ALL_PREFIXES(WebDatabaseTest, AutoFillProfile);
+  FRIEND_TEST_ALL_PREFIXES(WebDatabaseTest, CreditCard);
+  FRIEND_TEST_ALL_PREFIXES(WebDatabaseTest,
+                           RemoveAutoFillProfilesAndCreditCardsModifiedBetween);
 
   // Methods for adding autofill entries at a specified time.  For
   // testing only.
@@ -338,7 +376,9 @@ class WebDatabase {
   bool InitWebAppIconsTable();
   bool InitWebAppsTable();
 
-  void MigrateOldVersionsAsNeeded();
+  // Used by |Init()| to migration database schema from older versions to
+  // current version.
+  sql::InitStatus MigrateOldVersionsAsNeeded();
 
   sql::Connection db_;
   sql::MetaTable meta_table_;