contacts: Apply nits to ContactMap class.

chrome/browser/chromeos/contacts/contact_map_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_map.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/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 {
 
-typedef testing::Test ContactMapTest;
-
-TEST_F(ContactMapTest, Merge) {
+TEST(ContactMapTest, Merge) {
   ContactMap map;
   EXPECT_TRUE(map.empty());
   EXPECT_EQ(0U, map.size());
   EXPECT_EQ(base::Time(), map.GetMaxUpdateTime());
 
   // Create a contact.
   const std::string kContactId1 = "contact_id_1";
   scoped_ptr<Contact> contact1(new Contact);
   InitContact(kContactId1, "1", false, contact1.get());
   const base::Time kUpdateTime1 = base::Time::FromInternalValue(100);
@@ skipping 68 matching lines @@
   EXPECT_EQ(kUpdateTime2, map.GetMaxUpdateTime());
 
   map.Clear();
   EXPECT_TRUE(map.empty());
   EXPECT_EQ(0U, map.size());
   EXPECT_EQ(base::Time(), map.GetMaxUpdateTime());
 }
 
 }  // namespace test
 }  // namespace contacts