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

3 files changed, 54 insertions, 25 deletions

diff --git a/chrome/test/data/web_database/version_31.sql b/chrome/test/data/web_database/version_31.sql
new file mode 100644
index 0000000..feb12b4
--- /dev/null
+++ b/chrome/test/data/web_database/version_31.sql
@@ -0,0 +1,29 @@
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY,value LONGVARCHAR);
+INSERT INTO "meta" VALUES('version','31');
+INSERT INTO "meta" VALUES('last_compatible_version','31');
+INSERT INTO "meta" VALUES('Default Search Provider ID','2');
+INSERT INTO "meta" VALUES('Builtin Keyword Version','32');
+CREATE TABLE keywords (id INTEGER PRIMARY KEY,short_name VARCHAR NOT NULL,keyword VARCHAR NOT NULL,favicon_url VARCHAR NOT NULL,url VARCHAR NOT NULL,show_in_default_list INTEGER,safe_for_autoreplace INTEGER,originating_url VARCHAR,date_created INTEGER DEFAULT 0,usage_count INTEGER DEFAULT 0,input_encodings VARCHAR,suggest_url VARCHAR,prepopulate_id INTEGER DEFAULT 0,autogenerate_keyword INTEGER DEFAULT 0,logo_id INTEGER DEFAULT 0,created_by_policy INTEGER DEFAULT 0,instant_url VARCHAR);
+INSERT INTO "keywords" VALUES(2,'Google','google.com','http://www.google.com/favicon.ico','{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}{google:originalQueryForSuggestion}sourceid=chrome&ie={inputEncoding}&q={searchTerms}',1,1,'',0,0,'UTF-8','{google:baseSuggestURL}search?client=chrome&hl={language}&q={searchTerms}',1,1,6247,0,'{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&ie={inputEncoding}&ion=1{searchTerms}');
+INSERT INTO "keywords" VALUES(3,'Yahoo!','yahoo.com','http://search.yahoo.com/favicon.ico','http://search.yahoo.com/search?ei={inputEncoding}&fr=crmas&p={searchTerms}',1,1,'',0,0,'UTF-8','http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}',2,0,6264,0,'');
+INSERT INTO "keywords" VALUES(4,'Bing','bing.com','http://www.bing.com/s/wlflag.ico','http://www.bing.com/search?q={searchTerms}',1,1,'',0,0,'UTF-8','http://api.bing.com/osjson.aspx?query={searchTerms}&language={language}',3,0,6241,0,'');
+CREATE TABLE logins (origin_url VARCHAR NOT NULL, action_url VARCHAR, username_element VARCHAR, username_value VARCHAR, password_element VARCHAR, password_value BLOB, submit_element VARCHAR, signon_realm VARCHAR NOT NULL,ssl_valid INTEGER NOT NULL,preferred INTEGER NOT NULL,date_created INTEGER NOT NULL,blacklisted_by_user INTEGER NOT NULL,scheme INTEGER NOT NULL,UNIQUE (origin_url, username_element, username_value, password_element, submit_element, signon_realm));
+CREATE TABLE web_app_icons (url LONGVARCHAR,width int,height int,image BLOB, UNIQUE (url, width, height));
+CREATE TABLE web_apps (url LONGVARCHAR UNIQUE,has_all_images INTEGER NOT NULL);
+CREATE TABLE autofill (name VARCHAR, value VARCHAR, value_lower VARCHAR, pair_id INTEGER PRIMARY KEY, count INTEGER DEFAULT 1);
+CREATE TABLE autofill_dates ( pair_id INTEGER DEFAULT 0, date_created INTEGER DEFAULT 0);
+CREATE TABLE autofill_profiles ( label VARCHAR, unique_id INTEGER PRIMARY KEY, first_name VARCHAR, middle_name VARCHAR, last_name VARCHAR, email VARCHAR, company_name VARCHAR, address_line_1 VARCHAR, address_line_2 VARCHAR, city VARCHAR, state VARCHAR, zipcode VARCHAR, country VARCHAR, phone VARCHAR, fax VARCHAR, date_modified INTEGER NOT NULL DEFAULT 0, guid VARCHAR NOT NULL DEFAULT "");
+INSERT INTO "autofill_profiles" VALUES('Elvis Presley, 1122 PBJ Lane',1,'Elvis','','Presley','elvis@elvis.com','Hip Shake Inc.','1122 PBJ Lane','Suite 1','Memphis','TN','38116','USA','9013323322','',1288642516,'A4FF32F6-EF3F-379A-87F2-40A8811182A7');
+CREATE TABLE credit_cards ( label VARCHAR, unique_id INTEGER PRIMARY KEY, name_on_card VARCHAR, type VARCHAR, card_number VARCHAR, expiration_month INTEGER, expiration_year INTEGER, verification_code VARCHAR, billing_address VARCHAR, shipping_address VARCHAR, card_number_encrypted BLOB, verification_code_encrypted BLOB, date_modified INTEGER NOT NULL DEFAULT 0, guid VARCHAR NOT NULL DEFAULT "");
+INSERT INTO "credit_cards" VALUES('',2,'Jim J Jones','','',1,2011,'','0','',X'7631309863E9F1F33C2BDBFBFC86708448BDD8B37A495B628C8459A60D0CCD1047E69F',X'',1288642516,'B77F749C-8B0E-44B2-D299-3C80A95E0ADD');
+CREATE TABLE token_service (service VARCHAR PRIMARY KEY NOT NULL,encrypted_token BLOB);
+CREATE INDEX logins_signon ON logins (signon_realm);
+CREATE INDEX web_apps_url_index ON web_apps (url);
+CREATE INDEX autofill_name ON autofill (name);
+CREATE INDEX autofill_name_value_lower ON autofill (name, value_lower);
+CREATE INDEX autofill_dates_pair_id ON autofill_dates (pair_id);
+CREATE INDEX autofill_profiles_label_index ON autofill_profiles (label);
+CREATE INDEX credit_cards_label_index ON credit_cards (label);
+COMMIT;
diff --git a/chrome/test/live_sync/live_autofill_sync_test.h b/chrome/test/live_sync/live_autofill_sync_test.h
index 32cb2d3..0a12b1d 100644
--- a/chrome/test/live_sync/live_autofill_sync_test.h
+++ b/chrome/test/live_sync/live_autofill_sync_test.h
@@ -275,7 +275,7 @@ class LiveAutofillSyncTest : public LiveSyncTest {
         return false;
       }
       AutoFillProfile* expected_profile = &expected_profiles_map[p->Label()];
-      expected_profile->set_unique_id(p->unique_id());
+      expected_profile->set_guid(p->guid());
       if (*expected_profile != *p) {
         VLOG(1) << "Profile mismatch";
         return false;
diff --git a/chrome/test/live_sync/two_client_live_autofill_sync_test.cc b/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
index 916782f..db522f1 100644
--- a/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_autofill_sync_test.cc
@@ -145,9 +145,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, ProfileClient1HasData) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, expected_profiles[0]);
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[1]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[1]);
@@ -168,11 +168,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, ConflictLabels) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutoFillProfiles profiles1;
-  profiles1.push_back(new AutoFillProfile(string16(), 0));
+  profiles1.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, profiles1[0]);
 
   AutoFillProfiles profiles2;
-  profiles2.push_back(new AutoFillProfile(string16(), 0));
+  profiles2.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, profiles2[0]);
   profiles2[0]->SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER),
       ASCIIToUTF16("1234567890"));
@@ -200,9 +200,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[0]);
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[1]);
 
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
@@ -230,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, FAILS_ProfileSteady) {
 
   // Client0 adds a profile.
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, FAILS_ProfileSteady) {
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
 
   // Client1 adds a profile.
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, expected_profiles[1]);
   AddProfile(GetPersonalDataManager(1), *expected_profiles[1]);
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
@@ -254,7 +254,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, FAILS_ProfileSteady) {
       GetAllAutoFillProfiles(GetPersonalDataManager(1))));
 
   // Client0 adds a conflicting profile.
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, expected_profiles[2]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[2]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -313,7 +313,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, AddEmptyProfile) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_NULL, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -331,7 +331,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, AddProfile) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -351,19 +351,19 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest,
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
 
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[1]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[1]);
 
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_NULL, expected_profiles[2]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[2]);
 
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_FRASIER, expected_profiles[3]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[3]);
 
@@ -398,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, DeleteProfile) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -427,19 +427,19 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, FAILS_MergeProfiles) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
 
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_NULL, expected_profiles[1]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[1]);
 
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, expected_profiles[2]);
   AddProfile(GetPersonalDataManager(1), *expected_profiles[2]);
 
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_FRASIER, expected_profiles[3]);
   AddProfile(GetPersonalDataManager(1), *expected_profiles[3]);
   ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
@@ -457,7 +457,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, UpdateFields) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -489,12 +489,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, UpdateLabel) {
 
   AutoFillProfiles expected_profiles;
   AutoFillProfiles profiles0;
-  profiles0.push_back(new AutoFillProfile(string16(), 0));
+  profiles0.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, profiles0[0]);
   expected_profiles.push_back(profiles0[0]);
 
   AutoFillProfiles profiles1;
-  profiles1.push_back(new AutoFillProfile(string16(), 0));
+  profiles1.push_back(new AutoFillProfile);
   FillProfile(PROFILE_MARION, profiles1[0]);
   profiles1[0]->set_label(ASCIIToUTF16("Shipping"));
   expected_profiles.push_back(profiles1[0]);
@@ -518,7 +518,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveAutofillSyncTest, ConflictFields) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   AutoFillProfiles expected_profiles;
-  expected_profiles.push_back(new AutoFillProfile(string16(), 0));
+  expected_profiles.push_back(new AutoFillProfile);
   FillProfile(PROFILE_HOMER, expected_profiles[0]);
   AddProfile(GetPersonalDataManager(0), *expected_profiles[0]);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));