contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_test_util.cc

Index: chrome/browser/chromeos/contacts/contact_test_util.cc
diff --git a/chrome/browser/chromeos/contacts/contact_test_util.cc b/chrome/browser/chromeos/contacts/contact_test_util.cc
index 9a1ceae7f6d0ae43dd3723191db6327add075776..af375f78e5e4eac6d8a7689fec9bacab4ad54588 100644
--- a/chrome/browser/chromeos/contacts/contact_test_util.cc
+++ b/chrome/browser/chromeos/contacts/contact_test_util.cc
@@ -71,7 +71,7 @@ std::string InstantMessagingAddressToString(
 
 std::string ContactToString(const Contact& contact) {
   std::string result =
-      contact.provider_id() + "," +
+      contact.contact_id() + "," +
       base::Int64ToString(contact.update_time()) + "," +
       base::IntToString(contact.deleted()) + "," +
       contact.full_name() + "," +
@@ -150,13 +150,13 @@ void CopyContacts(const ScopedVector<Contact>& source,
   CopyContacts(pointers, dest);
 }
 
-void InitContact(const std::string& provider_id,
+void InitContact(const std::string& contact_id,
                  const std::string& name_suffix,
                  bool deleted,
                  Contact* contact) {
   DCHECK(contact);
   contact->Clear();
-  contact->set_provider_id(provider_id);
+  contact->set_contact_id(contact_id);
   contact->set_update_time(base::Time::Now().ToInternalValue());
   contact->set_deleted(deleted);
   contact->set_full_name("full_name_" + name_suffix);