Modified to allow to preserve two-word string in first-name and last-name in autofill profile.

components/autofill/core/browser/contact_info_unittest.cc

Index: components/autofill/core/browser/contact_info_unittest.cc
diff --git a/components/autofill/core/browser/contact_info_unittest.cc b/components/autofill/core/browser/contact_info_unittest.cc
index 4c2be9d42e490aa5f1ebe7c57e959e2f12a0604e..03ab16a1ab3e21237cd1b12be55dec5578078821 100644
--- a/components/autofill/core/browser/contact_info_unittest.cc
+++ b/components/autofill/core/browser/contact_info_unittest.cc
@@ -43,6 +43,73 @@ TEST(NameInfoTest, SetFullName) {
   EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Doyle"));
   EXPECT_EQ(name.GetRawInfo(NAME_FULL),
             ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16("Last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Middle Last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Last1 Last2"));
+  name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Last1 Last2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last1 Last2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last1 Last2"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First1 First2"));
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Middle1 Middle2"));
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Last1 Last2"));
+  name.SetRawInfo(NAME_FULL,
+                  ASCIIToUTF16("First1 First2 Middle1 Middle2 Last1 Last2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First1 First2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle1 Middle2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Middle1 Middle2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL),
+            ASCIIToUTF16("First1 First2 Middle1 Middle2 Last1 Last2"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("first1 first2"));
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("last1 last2"));
+  name.SetRawInfo(NAME_FULL, ASCIIToUTF16("middle1 middle2 last1 last2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("first1 first2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("middle1 middle2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("last1 last2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL),
+            ASCIIToUTF16("first1 first2 middle1 middle2 last1 last2"));
+
+  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("first1 first2"));
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FIRST, base::string16());
+  name.SetRawInfo(NAME_FULL, ASCIIToUTF16("middle last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("first1 first2"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("middle"));
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL),
+            ASCIIToUTF16("first1 first2 middle last"));
 }
 
 TEST(NameInfoTest, GetFullName) {