contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/contact_manager_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/contacts/contact_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 97 matching lines @@
 
   store->NotifyObserversAboutContactsUpdate();
   EXPECT_EQ(2, observer.num_updates());
 
   profile_manager_->DeleteTestingProfile(kProfileName);
   EXPECT_EQ(2, observer.num_updates());
 }
 
 TEST_F(ContactManagerTest, GetContacts) {
   // Create two contacts and tell the store to return them.
-  const std::string kProviderId1 = "1";
+  const std::string kContactId1 = "1";
   scoped_ptr<Contact> contact1(new Contact);
-  InitContact(kProviderId1, "1", false, contact1.get());
+  InitContact(kContactId1, "1", false, contact1.get());
 
-  const std::string kProviderId2 = "2";
+  const std::string kContactId2 = "2";
   scoped_ptr<Contact> contact2(new Contact);
-  InitContact(kProviderId2, "2", false, contact2.get());
+  InitContact(kContactId2, "2", false, contact2.get());
 
   const std::string kProfileName = "test_profile";
   TestingProfile* profile =
       profile_manager_->CreateTestingProfile(kProfileName);
   FakeContactStore* store = store_factory_->GetContactStoreForProfile(profile);
   ASSERT_TRUE(store);
 
   ContactPointers store_contacts;
   store_contacts.push_back(contact1.get());
   store_contacts.push_back(contact2.get());
   store->SetContacts(store_contacts);
   store->NotifyObserversAboutContactsUpdate();
 
   // Check that GetAllContacts() returns both contacts.
   scoped_ptr<ContactPointers> loaded_contacts =
       contact_manager_->GetAllContacts(profile);
   EXPECT_EQ(ContactsToString(store_contacts),
             ContactsToString(*loaded_contacts));
 
-  // Check that we can get individual contacts using GetContactByProviderId().
-  const Contact* loaded_contact =
-      contact_manager_->GetContactByProviderId(profile, kProviderId1);
+  // Check that we can get individual contacts using GetContactById().
+  const Contact* loaded_contact = contact_manager_->GetContactById(profile,
+                                                                   kContactId1);
   ASSERT_TRUE(loaded_contact);
   EXPECT_EQ(ContactToString(*contact1), ContactToString(*loaded_contact));
 
-  loaded_contact =
-      contact_manager_->GetContactByProviderId(profile, kProviderId2);
+  loaded_contact = contact_manager_->GetContactById(profile, kContactId2);
   ASSERT_TRUE(loaded_contact);
   EXPECT_EQ(ContactToString(*contact2), ContactToString(*loaded_contact));
 
-  // We should get NULL if we pass a nonexistent provider ID.
-  EXPECT_FALSE(contact_manager_->GetContactByProviderId(profile, "foo"));
+  // We should get NULL if we pass a nonexistent contact ID.
+  EXPECT_FALSE(contact_manager_->GetContactById(profile, "foo"));
 
   profile_manager_->DeleteTestingProfile(kProfileName);
 }
 
 TEST_F(ContactManagerTest, ProfileUnsupportedByContactStore) {
   // ContactManager shouldn't try to create a ContactStore for an unsuppported
   // Profile.
   store_factory_->set_permit_store_creation(false);
   const std::string kProfileName = "test_profile";
   TestingProfile* profile =
       profile_manager_->CreateTestingProfile(kProfileName);
   EXPECT_FALSE(store_factory_->GetContactStoreForProfile(profile));
   profile_manager_->DeleteTestingProfile(kProfileName);
 }
 
 }  // namespace test
 }  // namespace contacts