contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/fake_contact_database.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/fake_contact_database.h"
 
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_test_util.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 58 matching lines @@
 
 void FakeContactDatabase::MergeContacts(
     const ContactPointers& updated_contacts) {
   for (ContactPointers::const_iterator updated_it = updated_contacts.begin();
        updated_it != updated_contacts.end(); ++updated_it) {
     const Contact& updated_contact = **updated_it;
     bool found = false;
     for (ScopedVector<Contact>::const_iterator existing_it = contacts_.begin();
          existing_it != contacts_.end(); ++existing_it) {
       Contact* existing_contact = *existing_it;
-      if (existing_contact->provider_id() == updated_contact.provider_id()) {
+      if (existing_contact->contact_id() == updated_contact.contact_id()) {
         *existing_contact = updated_contact;
         found = true;
         break;
       }
     }
     if (!found)
       contacts_.push_back(new Contact(updated_contact));
   }
 }
 
 }  // namespace contacts