contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_database_unittest.cc

Index: chrome/browser/chromeos/contacts/contact_database_unittest.cc
diff --git a/chrome/browser/chromeos/contacts/contact_database_unittest.cc b/chrome/browser/chromeos/contacts/contact_database_unittest.cc
index 205ab1672bb48b17c8956564113c065c9a4d3d26..b869758106a57512a046abb88bac433f320b1fad 100644
--- a/chrome/browser/chromeos/contacts/contact_database_unittest.cc
+++ b/chrome/browser/chromeos/contacts/contact_database_unittest.cc
@@ -145,9 +145,9 @@ class ContactDatabaseTest : public testing::Test {
 TEST_F(ContactDatabaseTest, SaveAndReload) {
   // Save a contact to the database and check that we get the same data back
   // when loading it.
-  const std::string kProviderId = "provider_id_1";
+  const std::string kContactId = "contact_id_1";
   scoped_ptr<Contact> contact(new Contact);
-  InitContact(kProviderId, "1", false, contact.get());
+  InitContact(kContactId, "1", false, contact.get());
   AddEmailAddress("email_1", Contact_AddressType_Relation_HOME,
                   "email_label_1", true, contact.get());
   AddEmailAddress("email_2", Contact_AddressType_Relation_WORK,
@@ -180,7 +180,7 @@ TEST_F(ContactDatabaseTest, SaveAndReload) {
 
   // Modify the contact, save it, and check that the loaded contact is also
   // updated.
-  InitContact(kProviderId, "2", false, contact.get());
+  InitContact(kContactId, "2", false, contact.get());
   AddEmailAddress("email_3", Contact_AddressType_Relation_OTHER,
                   "email_label_2", true, contact.get());
   AddPhoneNumber("phone_2", Contact_AddressType_Relation_OTHER,
@@ -203,16 +203,16 @@ TEST_F(ContactDatabaseTest, SaveAndReload) {
 
 TEST_F(ContactDatabaseTest, FullAndPartialUpdates) {
   // Do a full update that inserts two contacts into the database.
-  const std::string kProviderId1 = "provider_id_1";
+  const std::string kContactId1 = "contact_id_1";
   const std::string kSharedEmail = "foo@example.org";
   scoped_ptr<Contact> contact1(new Contact);
-  InitContact(kProviderId1, "1", false, contact1.get());
+  InitContact(kContactId1, "1", false, contact1.get());
   AddEmailAddress(kSharedEmail, Contact_AddressType_Relation_HOME,
                   "", true, contact1.get());
 
-  const std::string kProviderId2 = "provider_id_2";
+  const std::string kContactId2 = "contact_id_2";
   scoped_ptr<Contact> contact2(new Contact);
-  InitContact(kProviderId2, "2", false, contact2.get());
+  InitContact(kContactId2, "2", false, contact2.get());
   AddEmailAddress(kSharedEmail, Contact_AddressType_Relation_WORK,
                   "", true, contact2.get());
 
@@ -229,7 +229,7 @@ TEST_F(ContactDatabaseTest, FullAndPartialUpdates) {
             ContactsToString(*loaded_contacts));
 
   // Do a partial update including just the second contact.
-  InitContact(kProviderId2, "2b", false, contact2.get());
+  InitContact(kContactId2, "2b", false, contact2.get());
   AddPostalAddress("postal_1", Contact_AddressType_Relation_HOME,
                    "", true, contact2.get());
   contacts_to_save.reset(new ContactPointers);
@@ -253,7 +253,7 @@ TEST_F(ContactDatabaseTest, FullAndPartialUpdates) {
 
   // Do a full update including just the first contact.  The second contact
   // should be removed from the database.
-  InitContact(kProviderId1, "1b", false, contact1.get());
+  InitContact(kContactId1, "1b", false, contact1.get());
   AddPostalAddress("postal_2", Contact_AddressType_Relation_WORK,
                    "", true, contact1.get());
   AddPhoneNumber("phone", Contact_AddressType_Relation_HOME,