contacts: Add ContactManagerInterface::GetWeakPtr().

chrome/browser/chromeos/contacts/contact_database_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_database.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 183 matching lines @@
   const int64 kNewLastUpdateTime = 5678;
   metadata_to_save->set_last_update_start_time(kNewLastUpdateTime);
   SaveContacts(contacts_to_save.Pass(), metadata_to_save.Pass(), true);
 
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_EQ(VarContactsToString(1, contact.get()),
             ContactsToString(*loaded_contacts));
   EXPECT_EQ(kNewLastUpdateTime, loaded_metadata->last_update_start_time());
 }
 
-TEST_F(ContactDatabaseTest, FullAndPartialUpdates) {
+TEST_F(ContactDatabaseTest, FullAndIncrementalUpdates) {
   // Do a full update that inserts two contacts into the database.
   const std::string kContactId1 = "contact_id_1";
   const std::string kSharedEmail = "foo@example.org";
   scoped_ptr<Contact> contact1(new Contact);
   InitContact(kContactId1, "1", false, contact1.get());
   AddEmailAddress(kSharedEmail, Contact_AddressType_Relation_HOME,
                   "", true, contact1.get());
 
   const std::string kContactId2 = "contact_id_2";
   scoped_ptr<Contact> contact2(new Contact);
   InitContact(kContactId2, "2", false, contact2.get());
   AddEmailAddress(kSharedEmail, Contact_AddressType_Relation_WORK,
                   "", true, contact2.get());
 
   scoped_ptr<ContactPointers> contacts_to_save(new ContactPointers);
   contacts_to_save->push_back(contact1.get());
   contacts_to_save->push_back(contact2.get());
   scoped_ptr<UpdateMetadata> metadata_to_save(new UpdateMetadata);
   SaveContacts(contacts_to_save.Pass(), metadata_to_save.Pass(), true);
 
   scoped_ptr<ScopedVector<Contact> > loaded_contacts;
   scoped_ptr<UpdateMetadata> loaded_metadata;
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_EQ(VarContactsToString(2, contact1.get(), contact2.get()),
             ContactsToString(*loaded_contacts));
 
-  // Do a partial update including just the second contact.
+  // Do an incremental update including just the second contact.
   InitContact(kContactId2, "2b", false, contact2.get());
   AddPostalAddress("postal_1", Contact_AddressType_Relation_HOME,
                    "", true, contact2.get());
   contacts_to_save.reset(new ContactPointers);
   contacts_to_save->push_back(contact2.get());
   metadata_to_save.reset(new UpdateMetadata);
   SaveContacts(contacts_to_save.Pass(), metadata_to_save.Pass(), false);
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_EQ(VarContactsToString(2, contact1.get(), contact2.get()),
             ContactsToString(*loaded_contacts));
 
-  // Do an empty partial update and check that the metadata is still updated.
+  // Do an empty incremental update and check that the metadata is still
+  // updated.
   contacts_to_save.reset(new ContactPointers);
   metadata_to_save.reset(new UpdateMetadata);
   const int64 kLastUpdateTime = 1234;
   metadata_to_save->set_last_update_start_time(kLastUpdateTime);
   SaveContacts(contacts_to_save.Pass(), metadata_to_save.Pass(), false);
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_EQ(VarContactsToString(2, contact1.get(), contact2.get()),
             ContactsToString(*loaded_contacts));
   EXPECT_EQ(kLastUpdateTime, loaded_metadata->last_update_start_time());
 
@@ skipping 42 matching lines @@
 
   scoped_ptr<ScopedVector<Contact> > loaded_contacts;
   scoped_ptr<UpdateMetadata> loaded_metadata;
   LoadContacts(&loaded_contacts, &loaded_metadata);
   EXPECT_EQ(VarContactsToString(1, contact.get()),
             ContactsToString(*loaded_contacts));
 }
 
 }  // namespace test
 }  // namespace contacts