contacts: Don't save deleted contacts to disk.

chrome/browser/chromeos/contacts/fake_contact_database.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_FAKE_CONTACT_DATABASE_H_
 #define CHROME_BROWSER_CHROMEOS_CONTACTS_FAKE_CONTACT_DATABASE_H_
 
 #include "chrome/browser/chromeos/contacts/contact_database.h"
 
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_map.h"
 
 namespace contacts {
 
 // Fake implementation used for testing.
 class FakeContactDatabase : public ContactDatabaseInterface {
  public:
   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; }
   void set_load_success(bool success) { load_success_ = success; }
 
   int num_saved_contacts() const { return num_saved_contacts_; }
   void reset_stats() { num_saved_contacts_ = 0; }
 
   // Copies |contacts| into |contacts_| and |metadata| into |metadata_|.  These
   // values will be returned by subsequent calls to LoadContacts().
   void SetContacts(const ContactPointers& contacts,
                    const UpdateMetadata& metadata);
 
   // ContactDatabaseInterface implementation.
   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;
   virtual void LoadContacts(LoadCallback callback) OVERRIDE;
 
  protected:
   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_;
   bool save_success_;
   bool load_success_;
 
   // Total number of contacts that have been passed to SaveContacts() while
   // |save_success_| is true.
   int num_saved_contacts_;
 
   // Currently-stored contacts and metadata.
   ContactMap contacts_;
   UpdateMetadata metadata_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeContactDatabase);
 };
 
 }  // namespace contacts
 
 #endif  // CHROME_BROWSER_CHROMEOS_CONTACTS_FAKE_CONTACT_DATABASE_H_