[Merge-57] Add billing_address_id and has_converted to autofill_table

components/autofill/core/browser/webdata/autofill_table.h

 // Copyright 2013 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 COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 149 matching lines @@
 //                      This is opaque to the client.
 //   status             Server's status of this card.
 //                      TODO(brettw) define constants for this.
 //   name_on_card
 //   type               Type of the credit card. This is one of the
 //                      kSyncCardType* strings.
 //   last_four          Last four digits of the card number. For de-duping
 //                      with locally stored cards and generating descriptions.
 //   exp_month          Expiration month: 1-12
 //   exp_year           Four-digit year: 2017
-//   billing_address_id The string that identifies the local or server profile
-//                      which is the billing address for this card. Can be null
-//                      in the database, but always returned as an empty string
-//                      in CreditCard. Added in version 67.
 //
 // unmasked_credit_cards
 //                      When a masked credit credit card is unmasked and the
 //                      full number is downloaded, it will be stored here.
 //
 //   id                 Server ID. This can be joined with the id in the
 //                      masked_credit_cards table to get the rest of the data.
 //   card_number_encrypted
 //                      Full card number, encrypted.
 //   use_count          DEPRECATED in version 65. See server_card_metadata.
 //   use_date           DEPRECATED in version 65. See server_card_metadata.
+//                      TODO(crbug.com/682326): Remove deprecated columns.
 //   unmask_date        The date this card was unmasked in units of
 //                      Time::ToInternalValue. Added in version 64.
 //
 // server_card_metadata
 //                      Metadata (currently, usage data) about server credit
 //                      cards. This will be synced.
 //
 //   id                 The server ID, which matches an ID from the
 //                      masked_credit_cards table.
 //   use_count          The number of times this card has been used to fill
 //                      a form.
 //   use_date           The date this card was last used to fill a form,
 //                      in internal t.
+//   billing_address_id The string that identifies the profile which is the
+//                      billing address for this card. Can be null in the
+//                      database, but always returned as an empty string in
+//                      CreditCard. Added in version 71.
 //
 // server_addresses     This table contains Autofill address data synced from
 //                      the wallet server. It's basically the same as the
 //                      autofill_profiles table but locally immutable.
 //
 //   id                 String assigned by the server to identify this address.
 //                      This is opaque to the client.
 //   recipient_name     Added in v63.
 //   company_name
 //   street_address     The combined lines of the street address.
@@ skipping 20 matching lines @@
 // server_address_metadata
 //                      Metadata (currently, usage data) about server addresses.
 //                      This will be synced.
 //
 //   id                 The server ID, which matches an ID from the
 //                      server_addresses table.
 //   use_count          The number of times this address has been used to fill
 //                      a form.
 //   use_date           The date this address was last used to fill a form,
 //                      in internal t.
+//   has_converted      Whether this server address has been converted to a
+//                      local autofill profile.
+//
 // autofill_sync_metadata
 //                      Sync-specific metadata for autofill records.
 //
 //   storage_key        A string that uniquely identifies the metadata record
 //                      as well as the corresponding autofill record.
 //   value              The serialized EntityMetadata record.
 //
 // autofill_model_type_state
 //                      Single row table that contains the sync ModelTypeState
 //                      for the autofill model type.
@@ skipping 120 matching lines @@
   // present in the new list will be preserved (even if the input is MASKED).
   void SetServerCreditCards(const std::vector<CreditCard>& credit_cards);
 
   // Cards synced from the server may be "masked" (only last 4 digits
   // available) or "unmasked" (everything is available). These functions set
   // that state.
   bool UnmaskServerCreditCard(const CreditCard& masked,
                               const base::string16& full_number);
   bool MaskServerCreditCard(const std::string& id);
 
-  bool UpdateServerCardUsageStats(const CreditCard& credit_card);
-  bool UpdateServerAddressUsageStats(const AutofillProfile& profile);
-
-  bool UpdateServerCardBillingAddress(const CreditCard& credit_card);
+  bool UpdateServerCardMetadata(const CreditCard& credit_card);
+  bool UpdateServerAddressMetadata(const AutofillProfile& profile);
 
   // Deletes all data from the server card and profile tables. Returns true if
   // any data was deleted, false if not (so false means "commit not needed"
   // rather than "error").
   bool ClearAllServerData();
 
   // Removes rows from autofill_profiles and credit_cards if they were created
   // on or after |delete_begin| and strictly before |delete_end|.  Returns the
   // list of deleted profile guids in |profile_guids|.  Return value is true if
   // all rows were successfully removed.  Returns false on database error.  In
@@ skipping 62 matching lines @@
   bool MigrateToVersion57AddFullNameField();
   bool MigrateToVersion60AddServerCards();
   bool MigrateToVersion61AddUsageStats();
   bool MigrateToVersion62AddUsageStatsForUnmaskedCards();
   bool MigrateToVersion63AddServerRecipientName();
   bool MigrateToVersion64AddUnmaskDate();
   bool MigrateToVersion65AddServerMetadataTables();
   bool MigrateToVersion66AddCardBillingAddress();
   bool MigrateToVersion67AddMaskedCardBillingAddress();
   bool MigrateToVersion70AddSyncMetadata();
+  bool MigrateToVersion71AddHasConvertedAndBillingAddressIdMetadata();
 
   // Max data length saved in the table, AKA the maximum length allowed for
   // form data.
   // Copied to components/autofill/ios/browser/resources/autofill_controller.js.
   static const size_t kMaxDataLength;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill_AddChanges);
   FRIEND_TEST_ALL_PREFIXES(
@@ skipping 72 matching lines @@
   bool InitServerAddressMetadataTable();
   bool InitAutofillSyncMetadataTable();
   bool InitModelTypeStateTable();
 
   DISALLOW_COPY_AND_ASSIGN(AutofillTable);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_