Autofill: Support 'full names' that are lacking a first or a middle name.

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 a99bd79101643accc57310b6de35e2c565d0f6e7..7e1b0be2166301081161407be74d530d519d1bb4 100644
--- a/chrome/browser/autofill/contact_info_unittest.cc
+++ b/chrome/browser/autofill/contact_info_unittest.cc
@@ -11,31 +11,92 @@
 #include "chrome/browser/autofill/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(NameInfoTest, TestSetFullName) {
+TEST(NameInfoTest, SetFullName) {
   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"));
+  name.SetInfo(NAME_FULL, ASCIIToUTF16("Virgil"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Virgil"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
+  EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Virgil"));
+
+  name.SetInfo(NAME_FULL, ASCIIToUTF16("Murray Gell-Mann"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Murray"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Gell-Mann"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Murray Gell-Mann"));
+
+  name.SetInfo(NAME_FULL,
+               ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Mikhail"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Yevgrafovich"));
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Saltykov-Shchedrin"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL),
+            ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
+
+  name.SetInfo(NAME_FULL, ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Arthur"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Ignatius Conan"));
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Doyle"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL),
+            ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
+}
+
+TEST(NameInfoTest, GetFullName) {
+  NameInfo name;
+  name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetInfo(NAME_MIDDLE, string16());
+  name.SetInfo(NAME_LAST, string16());
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
+  EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First"));
+
+  name.SetInfo(NAME_FIRST, string16());
+  name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+  name.SetInfo(NAME_LAST, string16());
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Middle"));
+
+  name.SetInfo(NAME_FIRST, string16());
+  name.SetInfo(NAME_MIDDLE, string16());
+  name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Last"));
+
+  name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+  name.SetInfo(NAME_LAST, string16());
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First Middle"));
+
+  name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetInfo(NAME_MIDDLE, string16());
+  name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First Last"));
+
+  name.SetInfo(NAME_FIRST, string16());
+  name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+  name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), string16());
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Middle Last"));
+
+  name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+  name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First Middle Last"));
 }