Autofill deprecate unique_ids in favor of guids for PersonalDataManager

Final round of unique_id deprecation.  These changes migrated web_database schemas for profiles and credit cards, clean up the web_dataservice interface, bring the personal_data_manager interface inline with the GUID interfaces for web_dataservice, convert remaining unit tests to be GUID-based, and some changes to platform UI code that used unique IDs for edits.

BUG=58813
TEST=WebDataServiceTest.*, WebDatabaseTest.*, WebDatabaseMigrationTest.*, PersonalDataManagerTest.*, AutoFillTest.*, AutoFillDialogControllerTest.AddNewProfile, AutoFillDialogControllerTest.AddNewCreditCard, AutoFillProfileTest.MergeWith, ProfileSyncServiceAutofillTest.*, TwoClientLiveAutofillSyncTest.*

Review URL: http://codereview.chromium.org/4388001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65100 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 15 deletions

diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc
index 5fe1e38..b4e92b8 100644
--- a/chrome/browser/autofill/credit_card.cc
+++ b/chrome/browser/autofill/credit_card.cc
@@ -126,26 +126,15 @@ std::string GetCreditCardType(const string16& number) {
 
 }  // namespace
 
-CreditCard::CreditCard(const string16& label,
-                       int unique_id)
-    : expiration_month_(0),
-      expiration_year_(0),
-      label_(label),
-      unique_id_(unique_id),
-      guid_(guid::GenerateGUID()) {
-}
-
 CreditCard::CreditCard(const std::string& guid)
     : expiration_month_(0),
       expiration_year_(0),
-      unique_id_(0),
       guid_(guid) {
 }
 
 CreditCard::CreditCard()
     : expiration_month_(0),
       expiration_year_(0),
-      unique_id_(0),
       guid_(guid::GenerateGUID()) {
 }
 
@@ -380,7 +369,6 @@ void CreditCard::operator=(const CreditCard& credit_card) {
   expiration_month_ = credit_card.expiration_month_;
   expiration_year_ = credit_card.expiration_year_;
   label_ = credit_card.label_;
-  unique_id_ = credit_card.unique_id_;
   guid_ = credit_card.guid_;
 }
 
@@ -403,7 +391,7 @@ int CreditCard::Compare(const CreditCard& credit_card) const {
 }
 
 bool CreditCard::operator==(const CreditCard& credit_card) const {
-  if (label_ != credit_card.label_ || unique_id_ != credit_card.unique_id_)
+  if (label_ != credit_card.label_ || guid_ != credit_card.guid_)
     return false;
 
   return Compare(credit_card) == 0;
@@ -615,8 +603,6 @@ std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card) {
   return os
       << UTF16ToUTF8(credit_card.Label())
       << " "
-      << credit_card.unique_id()
-      << " "
       << credit_card.guid()
       << " "
       << UTF16ToUTF8(credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NAME)))