contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_test_util.h

Index: chrome/browser/chromeos/contacts/contact_test_util.h
diff --git a/chrome/browser/chromeos/contacts/contact_test_util.h b/chrome/browser/chromeos/contacts/contact_test_util.h
index 4a61cde8b6861f66986eac4be576fc88069e7a7e..ac453e6feed1b346d7b0da8e6c5452e1559617b5 100644
--- a/chrome/browser/chromeos/contacts/contact_test_util.h
+++ b/chrome/browser/chromeos/contacts/contact_test_util.h
@@ -37,11 +37,11 @@ void CopyContacts(const ScopedVector<Contact>& source,
                   ScopedVector<Contact>* dest);
 
 // Initializes |contact| with the passed-in data.  The photo and all address
-// fields are cleared.  |provider_id| corresponds to Contact::provider_id,
+// fields are cleared.  |contact_id| corresponds to Contact::contact_id,
 // |deleted| to Contact::deleted, and a unique string should be passed to
 // |name_suffix| to make the name-related fields be distinct from those in other
 // contacts.
-void InitContact(const std::string& provider_id,
+void InitContact(const std::string& contact_id,
                  const std::string& name_suffix,
                  bool deleted,
                  Contact* contact);