contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_test_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CONTACTS_CONTACT_TEST_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_CONTACTS_CONTACT_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
@@ skipping 19 matching lines @@
 // const Contact* arguments.
 std::string VarContactsToString(int num_contacts, ...);
 
 // Saves copies of all contacts in |source| to |dest|.
 void CopyContacts(const ContactPointers& source,
                   ScopedVector<Contact>* dest);
 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);
 
 // Adds an email address to |contact|.
 void AddEmailAddress(const std::string& address,
                      Contact_AddressType_Relation relation,
                      const std::string& label,
                      bool primary,
                      Contact* contact);
@@ skipping 25 matching lines @@
 // ContactToString() includes the photo's dimensions in its output, so tests can
 // call this method to set the photo to a given size and then check that the
 // size matches later (e.g. after loading the contact from a server or from
 // disk) to confirm that the photo was loaded correctly.
 void SetPhoto(const gfx::Size& size, Contact* contact);
 
 }  // namespace test
 }  // namespace contacts
 
 #endif  // CHROME_BROWSER_CHROMEOS_CONTACTS_CONTACT_TEST_UTIL_H_