contacts: Don't save deleted contacts to disk.

chrome/browser/chromeos/contacts/fake_contact_database.h

Index: chrome/browser/chromeos/contacts/fake_contact_database.h
diff --git a/chrome/browser/chromeos/contacts/fake_contact_database.h b/chrome/browser/chromeos/contacts/fake_contact_database.h
index 1f70ab6e36b28e95f4101710b7696e5f66bafd1d..bcadc4ea463d4e6fed5b1505b41427f65bbb63f7 100644
--- a/chrome/browser/chromeos/contacts/fake_contact_database.h
+++ b/chrome/browser/chromeos/contacts/fake_contact_database.h
@@ -18,6 +18,7 @@ class FakeContactDatabase : public ContactDatabaseInterface {
   FakeContactDatabase();
 
   const ContactMap& contacts() const { return contacts_; }
+  const UpdateMetadata& metadata() const { return metadata_; }
 
   void set_init_success(bool success) { init_success_ = success; }
   void set_save_success(bool success) { save_success_ = success; }
@@ -35,7 +36,8 @@ class FakeContactDatabase : public ContactDatabaseInterface {
   virtual void DestroyOnUIThread() OVERRIDE;
   virtual void Init(const FilePath& database_dir,
                     InitCallback callback) OVERRIDE;
-  virtual void SaveContacts(scoped_ptr<ContactPointers> contacts,
+  virtual void SaveContacts(scoped_ptr<ContactPointers> contacts_to_save,
+                            scoped_ptr<ContactIds> contact_ids_to_delete,
                             scoped_ptr<UpdateMetadata> metadata,
                             bool is_full_update,
                             SaveCallback callback) OVERRIDE;
@@ -45,8 +47,10 @@ class FakeContactDatabase : public ContactDatabaseInterface {
   virtual ~FakeContactDatabase();
 
  private:
-  // Merges |updated_contacts| into |contacts_|.
-  void MergeContacts(const ContactPointers& updated_contacts);
+  // Merges |updated_contacts| into |contacts_| and deletes contacts with IDs in
+  // |contact_ids_to_delete|.
+  void MergeContacts(const ContactPointers& updated_contacts,
+                     const ContactIds& contact_ids_to_delete);
 
   // Should we report success in response to various requests?
   bool init_success_;