| Index: chrome/browser/chromeos/contacts/contact_map_unittest.cc
 | 
| diff --git a/chrome/browser/chromeos/contacts/contact_map_unittest.cc b/chrome/browser/chromeos/contacts/contact_map_unittest.cc
 | 
| deleted file mode 100644
 | 
| index ebd46e133b08c11bab6bee28de5446232ab92e7f..0000000000000000000000000000000000000000
 | 
| --- a/chrome/browser/chromeos/contacts/contact_map_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,105 +0,0 @@
 | 
| -// 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_map.h"
 | 
| -
 | 
| -#include "base/memory/scoped_ptr.h"
 | 
| -#include "base/memory/scoped_vector.h"
 | 
| -#include "base/time/time.h"
 | 
| -#include "chrome/browser/chromeos/contacts/contact.pb.h"
 | 
| -#include "chrome/browser/chromeos/contacts/contact_test_util.h"
 | 
| -#include "testing/gtest/include/gtest/gtest.h"
 | 
| -
 | 
| -namespace contacts {
 | 
| -namespace test {
 | 
| -
 | 
| -TEST(ContactMapTest, Merge) {
 | 
| -  ContactMap map;
 | 
| -  EXPECT_TRUE(map.empty());
 | 
| -  EXPECT_EQ(0U, map.size());
 | 
| -
 | 
| -  // Create a contact.
 | 
| -  const std::string kContactId1 = "contact_id_1";
 | 
| -  scoped_ptr<Contact> contact1(new Contact);
 | 
| -  InitContact(kContactId1, "1", false, contact1.get());
 | 
| -
 | 
| -  // Merge it into the map and check that it's stored.
 | 
| -  scoped_ptr<ScopedVector<Contact> > contacts_to_merge(
 | 
| -      new ScopedVector<Contact>);
 | 
| -  contacts_to_merge->push_back(new Contact(*contact1));
 | 
| -  map.Merge(contacts_to_merge.Pass(), ContactMap::KEEP_DELETED_CONTACTS);
 | 
| -  EXPECT_FALSE(map.empty());
 | 
| -  EXPECT_EQ(1U, map.size());
 | 
| -  ASSERT_TRUE(map.Find(kContactId1));
 | 
| -  EXPECT_EQ(ContactMapToString(map), VarContactsToString(1, contact1.get()));
 | 
| -
 | 
| -  // Create a second, deleted contact.
 | 
| -  const std::string kContactId2 = "contact_id_2";
 | 
| -  scoped_ptr<Contact> contact2(new Contact);
 | 
| -  InitContact(kContactId2, "2", true, contact2.get());
 | 
| -
 | 
| -  // Merge it into the map.  Since we request keeping deleted contacts, the
 | 
| -  // contact should be saved.
 | 
| -  contacts_to_merge.reset(new ScopedVector<Contact>);
 | 
| -  contacts_to_merge->push_back(new Contact(*contact2));
 | 
| -  map.Merge(contacts_to_merge.Pass(), ContactMap::KEEP_DELETED_CONTACTS);
 | 
| -  EXPECT_EQ(2U, map.size());
 | 
| -  ASSERT_TRUE(map.Find(kContactId2));
 | 
| -  EXPECT_EQ(ContactMapToString(map),
 | 
| -            VarContactsToString(2, contact1.get(), contact2.get()));
 | 
| -
 | 
| -  // Update the first contact's update time and merge it into the map.
 | 
| -  contact1->set_update_time(contact1->update_time() + 20);
 | 
| -  contacts_to_merge.reset(new ScopedVector<Contact>);
 | 
| -  contacts_to_merge->push_back(new Contact(*contact1));
 | 
| -  map.Merge(contacts_to_merge.Pass(), ContactMap::KEEP_DELETED_CONTACTS);
 | 
| -  EXPECT_EQ(ContactMapToString(map),
 | 
| -            VarContactsToString(2, contact1.get(), contact2.get()));
 | 
| -
 | 
| -  // Create another deleted contact.
 | 
| -  const std::string kContactId3 = "contact_id_3";
 | 
| -  scoped_ptr<Contact> contact3(new Contact);
 | 
| -  InitContact(kContactId3, "3", true, contact3.get());
 | 
| -
 | 
| -  // Merge it into the map with DROP_DELETED_CONTACTS.  The contact shouldn't be
 | 
| -  // saved.
 | 
| -  contacts_to_merge.reset(new ScopedVector<Contact>);
 | 
| -  contacts_to_merge->push_back(new Contact(*contact3));
 | 
| -  map.Merge(contacts_to_merge.Pass(), ContactMap::DROP_DELETED_CONTACTS);
 | 
| -  EXPECT_EQ(ContactMapToString(map),
 | 
| -            VarContactsToString(2, contact1.get(), contact2.get()));
 | 
| -
 | 
| -  // Mark the first contact as being deleted and merge it with
 | 
| -  // DROP_DELETED_CONTACTS.  The previous version of the contact should also be
 | 
| -  // removed.
 | 
| -  contact1->set_deleted(true);
 | 
| -  contacts_to_merge.reset(new ScopedVector<Contact>);
 | 
| -  contacts_to_merge->push_back(new Contact(*contact1));
 | 
| -  map.Merge(contacts_to_merge.Pass(), ContactMap::DROP_DELETED_CONTACTS);
 | 
| -  EXPECT_EQ(ContactMapToString(map), VarContactsToString(1, contact2.get()));
 | 
| -
 | 
| -  map.Clear();
 | 
| -  EXPECT_TRUE(map.empty());
 | 
| -  EXPECT_EQ(0U, map.size());
 | 
| -}
 | 
| -
 | 
| -TEST(ContactMapTest, Erase) {
 | 
| -  ContactMap map;
 | 
| -  const std::string kContactId = "contact_id";
 | 
| -  scoped_ptr<Contact> contact(new Contact);
 | 
| -  InitContact(kContactId, "1", false, contact.get());
 | 
| -
 | 
| -  scoped_ptr<ScopedVector<Contact> > contacts_to_merge(
 | 
| -      new ScopedVector<Contact>);
 | 
| -  contacts_to_merge->push_back(new Contact(*contact));
 | 
| -  map.Merge(contacts_to_merge.Pass(), ContactMap::KEEP_DELETED_CONTACTS);
 | 
| -  EXPECT_TRUE(map.Find(kContactId));
 | 
| -
 | 
| -  map.Erase(kContactId);
 | 
| -  EXPECT_FALSE(map.Find(kContactId));
 | 
| -  EXPECT_TRUE(map.empty());
 | 
| -}
 | 
| -
 | 
| -}  // namespace test
 | 
| -}  // namespace contacts
 | 
| 
 |