contacts: Rename provider_id to contact_id.

chrome/browser/chromeos/contacts/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/contact_database.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 196 matching lines @@
 
   // TODO(derat): Serializing all of the contacts and so we can write them in a
   // single batch may be expensive, memory-wise.  Consider writing them in
   // several batches instead.  (To avoid using partial writes in the event of a
   // crash, maybe add a dummy "write completed" contact that's removed in the
   // first batch and added in the last.)
   leveldb::WriteBatch updates;
   for (ContactPointers::const_iterator it = contacts->begin();
        it != contacts->end(); ++it) {
     const contacts::Contact& contact = **it;
-    if (contact.provider_id() == kUpdateMetadataKey) {
+    if (contact.contact_id() == kUpdateMetadataKey) {
       LOG(WARNING) << "Skipping contact with reserved ID "
-                   << contact.provider_id();
+                   << contact.contact_id();
       continue;
     }
-    updates.Put(leveldb::Slice(contact.provider_id()),
+    updates.Put(leveldb::Slice(contact.contact_id()),
                 leveldb::Slice(contact.SerializeAsString()));
     if (is_full_update)
-      keys_to_delete.erase(contact.provider_id());
+      keys_to_delete.erase(contact.contact_id());
   }
 
   for (std::set<std::string>::const_iterator it = keys_to_delete.begin();
        it != keys_to_delete.end(); ++it) {
     updates.Delete(leveldb::Slice(*it));
   }
 
   updates.Put(leveldb::Slice(kUpdateMetadataKey),
               leveldb::Slice(metadata->SerializeAsString()));
 
@@ skipping 39 matching lines @@
       }
       contacts->push_back(contact.release());
     }
     db_iterator->Next();
   }
 
   *success = true;
 }
 
 }  // namespace contacts