autofill names - dont parse when calling SetRawInfo(FULL_NAME)

components/autofill/core/browser/personal_data_manager_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1079 matching lines @@
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
 
   // Modify expected to include multi-valued fields.
-  std::vector<base::string16> values;
-  expected.GetRawMultiInfo(NAME_FULL, &values);
-  values.push_back(ASCIIToUTF16("John Adams"));
-  expected.SetRawMultiInfo(NAME_FULL, values);
-  expected.GetRawMultiInfo(EMAIL_ADDRESS, &values);
-  values.push_back(ASCIIToUTF16("second@gmail.com"));
-  expected.SetRawMultiInfo(EMAIL_ADDRESS, values);
+  std::vector<base::string16> first_names, last_names, emails;
+  expected.GetRawMultiInfo(NAME_FIRST, &first_names);
+  first_names.push_back(ASCIIToUTF16("John"));
+  expected.GetRawMultiInfo(NAME_LAST, &last_names);
+  last_names.push_back(ASCIIToUTF16("Adams"));
+  expected.SetRawMultiInfo(NAME_FIRST, first_names);
+  expected.SetRawMultiInfo(NAME_LAST, last_names);
+
+  expected.GetRawMultiInfo(EMAIL_ADDRESS, &emails);
+  emails.push_back(ASCIIToUTF16("second@gmail.com"));
+  expected.SetRawMultiInfo(EMAIL_ADDRESS, emails);
 
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }
 
 TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) {
   FormData form1;
   FormFieldData field;
   test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
@@ skipping 995 matching lines @@
   personal_data_->SaveImportedProfile(new_verified_profile);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   // The new profile should be merged into the existing one.
   AutofillProfile expected_profile = new_verified_profile;
   expected_profile.set_guid(profile.guid());
-  std::vector<base::string16> names;
-  expected_profile.GetRawMultiInfo(NAME_FULL, &names);
-  names.insert(names.begin(), ASCIIToUTF16("Marion Mitchell Morrison"));
-  expected_profile.SetRawMultiInfo(NAME_FULL, names);
+  std::vector<base::string16> first_names, middle_names, last_names;
+  expected_profile.GetRawMultiInfo(NAME_FIRST, &first_names);
+  expected_profile.GetRawMultiInfo(NAME_MIDDLE, &middle_names);
+  expected_profile.GetRawMultiInfo(NAME_LAST, &last_names);
+  first_names.insert(first_names.begin(), ASCIIToUTF16("Marion"));
+  middle_names.insert(middle_names.begin(), ASCIIToUTF16("Mitchell"));
+  last_names.insert(last_names.begin(), ASCIIToUTF16("Morrison"));
+  expected_profile.SetRawMultiInfo(NAME_FIRST, first_names);
+  expected_profile.SetRawMultiInfo(NAME_MIDDLE, middle_names);
+  expected_profile.SetRawMultiInfo(NAME_LAST, last_names);
 
   const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
   ASSERT_EQ(1U, results.size());
   EXPECT_EQ(expected_profile, *results[0]);
 }
 
 // Ensure that verified credit cards can be saved via SaveImportedCreditCard.
 TEST_F(PersonalDataManagerTest, SaveImportedCreditCardWithVerifiedData) {
   // Start with a verified credit card.
   CreditCard credit_card(base::GenerateGUID(), "Chrome settings");
@@ skipping 422 matching lines @@
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
   ASSERT_EQ(1U, results.size());
   EXPECT_EQ(0, profile.Compare(*results[0]));
   EXPECT_EQ("en", results[0]->language_code());
 }
 
 }  // namespace autofill