Autofill extend profiles to include multi-valued fields, part 2.

chrome/browser/autofill/contact_info_unittest.cc

Index: chrome/browser/autofill/contact_info_unittest.cc
diff --git a/chrome/browser/autofill/contact_info_unittest.cc b/chrome/browser/autofill/contact_info_unittest.cc
index 0ce9cecbcc32329b32b58a62677ceb44914ac2b1..a99bd79101643accc57310b6de35e2c565d0f6e7 100644
--- a/chrome/browser/autofill/contact_info_unittest.cc
+++ b/chrome/browser/autofill/contact_info_unittest.cc
@@ -11,57 +11,31 @@
 #include "chrome/browser/autofill/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class ContactInfoTest : public testing::Test {
- public:
-  ContactInfoTest() {}
-
-  string16 first(const ContactInfo& contact) {
-    return contact.first();
-  }
-  string16 middle(const ContactInfo& contact) {
-    return contact.middle();
-  }
-  string16 last(const ContactInfo& contact) {
-    return contact.last();
-  }
-  string16 FullName(const ContactInfo& contact) {
-    return contact.FullName();
-  }
-  void SetFullName(ContactInfo* contact, const string16& full_name) {
-    contact->SetFullName(full_name);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ContactInfoTest);
-};
-
-TEST_F(ContactInfoTest, TestSetFullName) {
-  ContactInfo contact_info;
-  SetFullName(&contact_info, ASCIIToUTF16("Virgil"));
-  EXPECT_EQ(first(contact_info), ASCIIToUTF16("Virgil"));
-  EXPECT_EQ(middle(contact_info), ASCIIToUTF16(""));
-  EXPECT_EQ(last(contact_info), ASCIIToUTF16(""));
-  EXPECT_EQ(FullName(contact_info), ASCIIToUTF16("Virgil"));
-
-  SetFullName(&contact_info, ASCIIToUTF16("Murray Gell-Mann"));
-  EXPECT_EQ(first(contact_info), ASCIIToUTF16("Murray"));
-  EXPECT_EQ(middle(contact_info), ASCIIToUTF16(""));
-  EXPECT_EQ(last(contact_info), ASCIIToUTF16("Gell-Mann"));
-  EXPECT_EQ(FullName(contact_info), ASCIIToUTF16("Murray Gell-Mann"));
-
-  SetFullName(&contact_info,
-              ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
-  EXPECT_EQ(first(contact_info), ASCIIToUTF16("Mikhail"));
-  EXPECT_EQ(middle(contact_info), ASCIIToUTF16("Yevgrafovich"));
-  EXPECT_EQ(last(contact_info), ASCIIToUTF16("Saltykov-Shchedrin"));
-  EXPECT_EQ(FullName(contact_info),
-            ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
-
-  SetFullName(&contact_info, ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
-  EXPECT_EQ(first(contact_info), ASCIIToUTF16("Arthur"));
-  EXPECT_EQ(middle(contact_info), ASCIIToUTF16("Ignatius Conan"));
-  EXPECT_EQ(last(contact_info), ASCIIToUTF16("Doyle"));
-  EXPECT_EQ(FullName(contact_info),
-            ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
+TEST(NameInfoTest, TestSetFullName) {
+  NameInfo name;
+  name.SetFullName(ASCIIToUTF16("Virgil"));
+  EXPECT_EQ(name.first(), ASCIIToUTF16("Virgil"));
+  EXPECT_EQ(name.middle(), ASCIIToUTF16(""));
+  EXPECT_EQ(name.last(), ASCIIToUTF16(""));
+  EXPECT_EQ(name.FullName(), ASCIIToUTF16("Virgil"));
+
+  name.SetFullName(ASCIIToUTF16("Murray Gell-Mann"));
+  EXPECT_EQ(name.first(), ASCIIToUTF16("Murray"));
+  EXPECT_EQ(name.middle(), ASCIIToUTF16(""));
+  EXPECT_EQ(name.last(), ASCIIToUTF16("Gell-Mann"));
+  EXPECT_EQ(name.FullName(), ASCIIToUTF16("Murray Gell-Mann"));
+
+  name.SetFullName(ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
+  EXPECT_EQ(name.first(), ASCIIToUTF16("Mikhail"));
+  EXPECT_EQ(name.middle(), ASCIIToUTF16("Yevgrafovich"));
+  EXPECT_EQ(name.last(), ASCIIToUTF16("Saltykov-Shchedrin"));
+  EXPECT_EQ(name.FullName(),
+      ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
+
+  name.SetFullName(ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
+  EXPECT_EQ(name.first(), ASCIIToUTF16("Arthur"));
+  EXPECT_EQ(name.middle(), ASCIIToUTF16("Ignatius Conan"));
+  EXPECT_EQ(name.last(), ASCIIToUTF16("Doyle"));
+  EXPECT_EQ(name.FullName(), ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
 }