[Autofill] Rewrite Autofill unitttests to use INSTANTIATE_TEST_CASE_P

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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 101 matching lines @@
 
   EXPECT_EQ(std::mismatch(results_copy.begin(),
                           results_copy.end(),
                           expectations_copy.begin(),
                           ElementsEqual<T>).first,
             results_copy.end());
 }
 
 }  // anonymous namespace
 
-class PersonalDataManagerTest : public testing::Test {
+class PersonalDataManagerTestBase {
  protected:
-  PersonalDataManagerTest() : autofill_table_(nullptr) {}
-
-  void SetUp() override {
-    OSCryptMocker::SetUpWithSingleton();
-    prefs_ = test::PrefServiceForTesting();
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    base::FilePath path = temp_dir_.GetPath().AppendASCII("TestWebDB");
-    web_database_ =
-        new WebDatabaseService(path, base::ThreadTaskRunnerHandle::Get(),
-                               base::ThreadTaskRunnerHandle::Get());
-
-    // Setup account tracker.
-    signin_client_.reset(new TestSigninClient(prefs_.get()));
-    account_tracker_.reset(new AccountTrackerService());
-    account_tracker_->Initialize(signin_client_.get());
-    signin_manager_.reset(new FakeSigninManagerBase(signin_client_.get(),
-                                                    account_tracker_.get()));
-    signin_manager_->Initialize(prefs_.get());
-
-    // Hacky: hold onto a pointer but pass ownership.
-    autofill_table_ = new AutofillTable;
-    web_database_->AddTable(std::unique_ptr<WebDatabaseTable>(autofill_table_));
-    web_database_->LoadDatabase();
-    autofill_database_service_ = new AutofillWebDataService(
-        web_database_, base::ThreadTaskRunnerHandle::Get(),
-        base::ThreadTaskRunnerHandle::Get(),
-        WebDataServiceBase::ProfileErrorCallback());
-    autofill_database_service_->Init();
-
-    test::DisableSystemServices(prefs_.get());
-    ResetPersonalDataManager(USER_MODE_NORMAL);
-
-    // Reset the deduping pref to its default value.
-    personal_data_->pref_service_->SetInteger(
-        prefs::kAutofillLastVersionDeduped, 0);
-    personal_data_->pref_service_->SetBoolean(
-        prefs::kAutofillProfileUseDatesFixed, false);
-  }
-
-  void TearDown() override {
-    // Order of destruction is important as AutofillManager relies on
-    // PersonalDataManager to be around when it gets destroyed.
-    signin_manager_->Shutdown();
-    signin_manager_.reset();
-
-    account_tracker_->Shutdown();
-    account_tracker_.reset();
-    signin_client_.reset();
-
-    test::DisableSystemServices(prefs_.get());
-    OSCryptMocker::TearDown();
-  }
+  PersonalDataManagerTestBase() : autofill_table_(nullptr) {}
 
   void ResetPersonalDataManager(UserMode user_mode) {
     bool is_incognito = (user_mode == USER_MODE_INCOGNITO);
     personal_data_.reset(new PersonalDataManager("en"));
     personal_data_->Init(
         scoped_refptr<AutofillWebDataService>(autofill_database_service_),
         prefs_.get(),
         account_tracker_.get(),
         signin_manager_.get(),
         is_incognito);
@@ skipping 158 matching lines @@
   std::unique_ptr<TestSigninClient> signin_client_;
   scoped_refptr<AutofillWebDataService> autofill_database_service_;
   scoped_refptr<WebDatabaseService> web_database_;
   AutofillTable* autofill_table_;  // weak ref
   PersonalDataLoadedObserverMock personal_data_observer_;
   std::unique_ptr<PersonalDataManager> personal_data_;
 
   variations::testing::VariationParamsManager variation_params_;
 };
 
+class PersonalDataManagerTest : public PersonalDataManagerTestBase,
+                                public testing::Test {
+  void SetUp() override {
+    OSCryptMocker::SetUpWithSingleton();
+    prefs_ = test::PrefServiceForTesting();
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    base::FilePath path = temp_dir_.GetPath().AppendASCII("TestWebDB");
+    web_database_ =
+        new WebDatabaseService(path, base::ThreadTaskRunnerHandle::Get(),
+                               base::ThreadTaskRunnerHandle::Get());
+
+    // Setup account tracker.
+    signin_client_.reset(new TestSigninClient(prefs_.get()));
+    account_tracker_.reset(new AccountTrackerService());
+    account_tracker_->Initialize(signin_client_.get());
+    signin_manager_.reset(new FakeSigninManagerBase(signin_client_.get(),
+                                                    account_tracker_.get()));
+    signin_manager_->Initialize(prefs_.get());
+
+    // Hacky: hold onto a pointer but pass ownership.
+    autofill_table_ = new AutofillTable;
+    web_database_->AddTable(std::unique_ptr<WebDatabaseTable>(autofill_table_));
+    web_database_->LoadDatabase();
+    autofill_database_service_ = new AutofillWebDataService(
+        web_database_, base::ThreadTaskRunnerHandle::Get(),
+        base::ThreadTaskRunnerHandle::Get(),
+        WebDataServiceBase::ProfileErrorCallback());
+    autofill_database_service_->Init();
+
+    test::DisableSystemServices(prefs_.get());
+    ResetPersonalDataManager(USER_MODE_NORMAL);
+
+    // Reset the deduping pref to its default value.
+    personal_data_->pref_service_->SetInteger(
+        prefs::kAutofillLastVersionDeduped, 0);
+    personal_data_->pref_service_->SetBoolean(
+        prefs::kAutofillProfileUseDatesFixed, false);
+  }
+
+  void TearDown() override {
+    // Order of destruction is important as AutofillManager relies on
+    // PersonalDataManager to be around when it gets destroyed.
+    signin_manager_->Shutdown();
+    signin_manager_.reset();
+
+    account_tracker_->Shutdown();
+    account_tracker_.reset();
+    signin_client_.reset();
+
+    test::DisableSystemServices(prefs_.get());
+    OSCryptMocker::TearDown();
+  }
+};
+
 TEST_F(PersonalDataManagerTest, AddProfile) {
   // Add profile0 to the database.
   AutofillProfile profile0(test::GetFullProfile());
   profile0.SetRawInfo(EMAIL_ADDRESS, ASCIIToUTF16("j@s.com"));
   personal_data_->AddProfile(profile0);
 
   // Reload the database.
   ResetPersonalDataManager(USER_MODE_NORMAL);
 
   // Verify the addition.
@@ skipping 3799 matching lines @@
   FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes();
   std::unique_ptr<CreditCard> imported_credit_card2;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure2, false,
                                               &imported_credit_card2));
   EXPECT_FALSE(imported_credit_card2);
 }
 
 // Tests the SaveImportedProfile method with different profiles to make sure the
 // merge logic works correctly.
-TEST_F(PersonalDataManagerTest, SaveImportedProfile) {
-  typedef struct {
-    autofill::ServerFieldType field_type;
-    std::string field_value;
+typedef struct {
+  autofill::ServerFieldType field_type;
+  std::string field_value;
   } ProfileField;
 
   typedef std::vector<ProfileField> ProfileFields;
 
   typedef struct {
     // Each test starts with a default pre-existing profile and applies these
     // changes to it.
     ProfileFields changes_to_original;
     // Each test saves a second profile. Applies these changes to the default
     // values before saving.
     ProfileFields changes_to_new;
     // For tests with profile merging, makes sure that these fields' values are
     // the ones we expect (depending on the test).
     ProfileFields changed_field_values;
-  } TestCase;
+  } SaveImportedProfileTestCase;
 
-  TestCase test_cases[] = {
-      // Test that saving an identical profile except for the name results in
-      // two profiles being saved.
-      {ProfileFields(), {{NAME_FIRST, "Marionette"}}},
+  class SaveImportedProfileTest
+      : public PersonalDataManagerTestBase,
+        public testing::TestWithParam<SaveImportedProfileTestCase> {
+   public:
+    SaveImportedProfileTest() {}
+    ~SaveImportedProfileTest() override {}
 
-      // Test that saving an identical profile except with the middle name
-      // initial instead of the full middle name results in the profiles
-      // getting merged and the full middle name being kept.
-      {ProfileFields(),
-       {{NAME_MIDDLE, "M"}},
-       {{NAME_MIDDLE, "Mitchell"}, {NAME_FULL, "Marion Mitchell Morrison"}}},
+    void SetUp() override {
+      OSCryptMocker::SetUpWithSingleton();
+      prefs_ = test::PrefServiceForTesting();
+      ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+      base::FilePath path = temp_dir_.GetPath().AppendASCII("TestWebDB");
+      web_database_ =
+          new WebDatabaseService(path, base::ThreadTaskRunnerHandle::Get(),
+                                 base::ThreadTaskRunnerHandle::Get());
 
-      // Test that saving an identical profile except with the full middle name
-      // instead of the middle name initial results in the profiles getting
-      // merged and the full middle name replacing the initial.
-      {{{NAME_MIDDLE, "M"}},
-       {{NAME_MIDDLE, "Mitchell"}},
-       {{NAME_MIDDLE, "Mitchell"}}},
+      // Setup account tracker.
+      signin_client_.reset(new TestSigninClient(prefs_.get()));
+      account_tracker_.reset(new AccountTrackerService());
+      account_tracker_->Initialize(signin_client_.get());
+      signin_manager_.reset(new FakeSigninManagerBase(signin_client_.get(),
+                                                      account_tracker_.get()));
+      signin_manager_->Initialize(prefs_.get());
 
-      // Test that saving an identical profile except with no middle name
-      // results in the profiles getting merged and the full middle name being
-      // kept.
-      {ProfileFields(), {{NAME_MIDDLE, ""}}, {{NAME_MIDDLE, "Mitchell"}}},
+      // Hacky: hold onto a pointer but pass ownership.
+      autofill_table_ = new AutofillTable;
+      web_database_->AddTable(
+          std::unique_ptr<WebDatabaseTable>(autofill_table_));
+      web_database_->LoadDatabase();
+      autofill_database_service_ = new AutofillWebDataService(
+          web_database_, base::ThreadTaskRunnerHandle::Get(),
+          base::ThreadTaskRunnerHandle::Get(),
+          WebDataServiceBase::ProfileErrorCallback());
+      autofill_database_service_->Init();
 
-      // Test that saving an identical profile except with a middle name initial
-      // results in the profiles getting merged and the middle name initial
-      // being saved.
-      {{{NAME_MIDDLE, ""}}, {{NAME_MIDDLE, "M"}}, {{NAME_MIDDLE, "M"}}},
+      test::DisableSystemServices(prefs_.get());
+      ResetPersonalDataManager(USER_MODE_NORMAL);
 
-      // Test that saving an identical profile except with a middle name
-      // results in the profiles getting merged and the full middle name being
-      // saved.
-      {{{NAME_MIDDLE, ""}},
-       {{NAME_MIDDLE, "Mitchell"}},
-       {{NAME_MIDDLE, "Mitchell"}}},
+      // Reset the deduping pref to its default value.
+      personal_data_->pref_service_->SetInteger(
+          prefs::kAutofillLastVersionDeduped, 0);
+      personal_data_->pref_service_->SetBoolean(
+          prefs::kAutofillProfileUseDatesFixed, false);
+    }
 
-      // Test that saving a identical profile except with the full name set
-      // instead of the name parts results in the two profiles being merged and
-      // all the name parts kept and the full name being added.
-      {
-          {
-              {NAME_FIRST, "Marion"},
-              {NAME_MIDDLE, "Mitchell"},
-              {NAME_LAST, "Morrison"},
-              {NAME_FULL, ""},
-          },
-          {
-              {NAME_FIRST, ""},
-              {NAME_MIDDLE, ""},
-              {NAME_LAST, ""},
-              {NAME_FULL, "Marion Mitchell Morrison"},
-          },
-          {
-              {NAME_FIRST, "Marion"},
-              {NAME_MIDDLE, "Mitchell"},
-              {NAME_LAST, "Morrison"},
-              {NAME_FULL, "Marion Mitchell Morrison"},
-          },
-      },
+    void TearDown() override {
+      // Order of destruction is important as AutofillManager relies on
+      // PersonalDataManager to be around when it gets destroyed.
+      signin_manager_->Shutdown();
+      signin_manager_.reset();
 
-      // Test that saving a identical profile except with the name parts set
-      // instead of the full name results in the two profiles being merged and
-      // the full name being kept and all the name parts being added.
-      {
-          {
-              {NAME_FIRST, ""},
-              {NAME_MIDDLE, ""},
-              {NAME_LAST, ""},
-              {NAME_FULL, "Marion Mitchell Morrison"},
-          },
-          {
-              {NAME_FIRST, "Marion"},
-              {NAME_MIDDLE, "Mitchell"},
-              {NAME_LAST, "Morrison"},
-              {NAME_FULL, ""},
-          },
-          {
-              {NAME_FIRST, "Marion"},
-              {NAME_MIDDLE, "Mitchell"},
-              {NAME_LAST, "Morrison"},
-              {NAME_FULL, "Marion Mitchell Morrison"},
-          },
-      },
+      account_tracker_->Shutdown();
+      account_tracker_.reset();
+      signin_client_.reset();
 
-      // Test that saving a profile that has only a full name set does not get
-      // merged with a profile with only the name parts set if the names are
-      // different.
-      {
-          {
-              {NAME_FIRST, "Marion"},
-              {NAME_MIDDLE, "Mitchell"},
-              {NAME_LAST, "Morrison"},
-              {NAME_FULL, ""},
-          },
-          {
-              {NAME_FIRST, ""},
-              {NAME_MIDDLE, ""},
-              {NAME_LAST, ""},
-              {NAME_FULL, "John Thompson Smith"},
-          },
-      },
-
-      // Test that saving a profile that has only the name parts set does not
-      // get merged with a profile with only the full name set if the names are
-      // different.
-      {
-          {
-              {NAME_FIRST, ""},
-              {NAME_MIDDLE, ""},
-              {NAME_LAST, ""},
-              {NAME_FULL, "John Thompson Smith"},
-          },
-          {
-              {NAME_FIRST, "Marion"},
-              {NAME_MIDDLE, "Mitchell"},
-              {NAME_LAST, "Morrison"},
-              {NAME_FULL, ""},
-          },
-      },
-
-      // Test that saving an identical profile except for the first address line
-      // results in two profiles being saved.
-      {ProfileFields(), {{ADDRESS_HOME_LINE1, "123 Aquarium St."}}},
-
-      // Test that saving an identical profile except for the second address
-      // line results in two profiles being saved.
-      {ProfileFields(), {{ADDRESS_HOME_LINE2, "unit 7"}}},
-
-      // Tests that saving an identical profile that has a new piece of
-      // information (company name) results in a merge and that the original
-      // empty value gets overwritten by the new information.
-      {{{COMPANY_NAME, ""}}, ProfileFields(), {{COMPANY_NAME, "Fox"}}},
-
-      // Tests that saving an identical profile except a loss of information
-      // results in a merge but the original value is not overwritten (no
-      // information loss).
-      {ProfileFields(), {{COMPANY_NAME, ""}}, {{COMPANY_NAME, "Fox"}}},
-
-      // Tests that saving an identical profile except a slightly different
-      // postal code results in a merge with the new value kept.
-      {{{ADDRESS_HOME_ZIP, "R2C 0A1"}},
-       {{ADDRESS_HOME_ZIP, "R2C0A1"}},
-       {{ADDRESS_HOME_ZIP, "R2C0A1"}}},
-      {{{ADDRESS_HOME_ZIP, "R2C0A1"}},
-       {{ADDRESS_HOME_ZIP, "R2C 0A1"}},
-       {{ADDRESS_HOME_ZIP, "R2C 0A1"}}},
-      {{{ADDRESS_HOME_ZIP, "r2c 0a1"}},
-       {{ADDRESS_HOME_ZIP, "R2C0A1"}},
-       {{ADDRESS_HOME_ZIP, "R2C0A1"}}},
-
-      // Tests that saving an identical profile plus a new piece of information
-      // on the address line 2 results in a merge and that the original empty
-      // value gets overwritten by the new information.
-      {{{ADDRESS_HOME_LINE2, ""}},
-       ProfileFields(),
-       {{ADDRESS_HOME_LINE2, "unit 5"}}},
-
-      // Tests that saving an identical profile except a loss of information on
-      // the address line 2 results in a merge but that the original value gets
-      // not overwritten (no information loss).
-      {ProfileFields(),
-       {{ADDRESS_HOME_LINE2, ""}},
-       {{ADDRESS_HOME_LINE2, "unit 5"}}},
-
-      // Tests that saving an identical except with more punctuation in the fist
-      // address line, while the second is empty, results in a merge and that
-      // the original address gets overwritten.
-      {{{ADDRESS_HOME_LINE2, ""}},
-       {{ADDRESS_HOME_LINE2, ""}, {ADDRESS_HOME_LINE1, "123, Zoo St."}},
-       {{ADDRESS_HOME_LINE1, "123, Zoo St."}}},
-
-      // Tests that saving an identical profile except with less punctuation in
-      // the fist address line, while the second is empty, results in a merge
-      // and that the longer address is retained.
-      {{{ADDRESS_HOME_LINE2, ""}, {ADDRESS_HOME_LINE1, "123, Zoo St."}},
-       {{ADDRESS_HOME_LINE2, ""}},
-       {{ADDRESS_HOME_LINE1, "123 Zoo St"}}},
-
-      // Tests that saving an identical profile except additional punctuation in
-      // the two address lines results in a merge and that the newer address
-      // is retained.
-      {ProfileFields(),
-       {{ADDRESS_HOME_LINE1, "123, Zoo St."}, {ADDRESS_HOME_LINE2, "unit. 5"}},
-       {{ADDRESS_HOME_LINE1, "123, Zoo St."}, {ADDRESS_HOME_LINE2, "unit. 5"}}},
-
-      // Tests that saving an identical profile except less punctuation in the
-      // two address lines results in a merge and that the newer address is
-      // retained.
-      {{{ADDRESS_HOME_LINE1, "123, Zoo St."}, {ADDRESS_HOME_LINE2, "unit. 5"}},
-       ProfileFields(),
-       {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
-
-      // Tests that saving an identical profile with accented characters in
-      // the two address lines results in a merge and that the newer address
-      // is retained.
-      {ProfileFields(),
-       {{ADDRESS_HOME_LINE1, "123 Zôö St"}, {ADDRESS_HOME_LINE2, "üñìt 5"}},
-       {{ADDRESS_HOME_LINE1, "123 Zôö St"}, {ADDRESS_HOME_LINE2, "üñìt 5"}}},
-
-      // Tests that saving an identical profile without accented characters in
-      // the two address lines results in a merge and that the newer address
-      // is retained.
-      {{{ADDRESS_HOME_LINE1, "123 Zôö St"}, {ADDRESS_HOME_LINE2, "üñìt 5"}},
-       ProfileFields(),
-       {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
-
-      // Tests that saving an identical profile except that the address line 1
-      // is in the address line 2 results in a merge and that the multi-lne
-      // address is retained.
-      {ProfileFields(),
-       {{ADDRESS_HOME_LINE1, "123 Zoo St, unit 5"}, {ADDRESS_HOME_LINE2, ""}},
-       {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
-
-      // Tests that saving an identical profile except that the address line 2
-      // contains part of the old address line 1 results in a merge and that the
-      // original address lines of the reference profile get overwritten.
-      {{{ADDRESS_HOME_LINE1, "123 Zoo St, unit 5"}, {ADDRESS_HOME_LINE2, ""}},
-       ProfileFields(),
-       {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
-
-      // Tests that saving an identical profile except that the state is the
-      // abbreviation instead of the full form results in a merge and that the
-      // original state gets overwritten.
-      {{{ADDRESS_HOME_STATE, "California"}},
-       ProfileFields(),
-       {{ADDRESS_HOME_STATE, "CA"}}},
-
-      // Tests that saving an identical profile except that the state is the
-      // full form instead of the abbreviation results in a merge and that the
-      // abbreviated state is retained.
-      {ProfileFields(),
-       {{ADDRESS_HOME_STATE, "California"}},
-       {{ADDRESS_HOME_STATE, "CA"}}},
-
-      // Tests that saving and identical profile except that the company name
-      // has different punctuation and case results in a merge and that the
-      // syntax of the new profile replaces the old one.
-      {{{COMPANY_NAME, "Stark inc"}},
-       {{COMPANY_NAME, "Stark Inc."}},
-       {{COMPANY_NAME, "Stark Inc."}}},
+      test::DisableSystemServices(prefs_.get());
+      OSCryptMocker::TearDown();
+    }
   };
 
-  // Create the test clock.
-  TestAutofillClock test_clock;
-
-  for (TestCase test_case : test_cases) {
+  TEST_P(SaveImportedProfileTest, SaveImportedProfile) {
+    // Create the test clock.
+    TestAutofillClock test_clock;
+    auto test_case = GetParam();
     // Set the time to a specific value.
     test_clock.SetNow(kArbitraryTime);
 
     SetupReferenceProfile();
     const std::vector<AutofillProfile*>& initial_profiles =
         personal_data_->GetProfiles();
 
     // Apply changes to the original profile (if applicable).
     for (ProfileField change : test_case.changes_to_original) {
       initial_profiles.front()->SetRawInfo(
@@ skipping 34 matching lines @@
       // Verify that the merged profile's use count, use date and modification
       // date were properly updated.
       EXPECT_EQ(1U, saved_profiles.front()->use_count());
       EXPECT_EQ(kSomeLaterTime, saved_profiles.front()->use_date());
       EXPECT_EQ(kSomeLaterTime, saved_profiles.front()->modification_date());
     }
 
     // Erase the profiles for the next test.
     ResetProfiles();
   }
+
+  INSTANTIATE_TEST_CASE_P(
+      PersonalDataManagerTest,
+      SaveImportedProfileTest,
+      testing::Values(
+          // Test that saving an identical profile except for the name results
+          // in two profiles being saved.
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{NAME_FIRST, "Marionette"}}},
+
+          // Test that saving an identical profile except with the middle name
+          // initial instead of the full middle name results in the profiles
+          // getting merged and the full middle name being kept.
+          SaveImportedProfileTestCase{
+              ProfileFields(),
+              {{NAME_MIDDLE, "M"}},
+              {{NAME_MIDDLE, "Mitchell"},
+               {NAME_FULL, "Marion Mitchell Morrison"}}},
+
+          // Test that saving an identical profile except with the full middle
+          // name instead of the middle name initial results in the profiles
+          // getting merged and the full middle name replacing the initial.
+          SaveImportedProfileTestCase{{{NAME_MIDDLE, "M"}},
+                                      {{NAME_MIDDLE, "Mitchell"}},
+                                      {{NAME_MIDDLE, "Mitchell"}}},
+
+          // Test that saving an identical profile except with no middle name
+          // results in the profiles getting merged and the full middle name
+          // being kept.
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{NAME_MIDDLE, ""}},
+                                      {{NAME_MIDDLE, "Mitchell"}}},
+
+          // Test that saving an identical profile except with a middle name
+          // initial results in the profiles getting merged and the middle name
+          // initial being saved.
+          SaveImportedProfileTestCase{{{NAME_MIDDLE, ""}},
+                                      {{NAME_MIDDLE, "M"}},
+                                      {{NAME_MIDDLE, "M"}}},
+
+          // Test that saving an identical profile except with a middle name
+          // results in the profiles getting merged and the full middle name
+          // being saved.
+          SaveImportedProfileTestCase{{{NAME_MIDDLE, ""}},
+                                      {{NAME_MIDDLE, "Mitchell"}},
+                                      {{NAME_MIDDLE, "Mitchell"}}},
+
+          // Test that saving a identical profile except with the full name set
+          // instead of the name parts results in the two profiles being merged
+          // and all the name parts kept and the full name being added.
+          SaveImportedProfileTestCase{
+              {
+                  {NAME_FIRST, "Marion"},
+                  {NAME_MIDDLE, "Mitchell"},
+                  {NAME_LAST, "Morrison"},
+                  {NAME_FULL, ""},
+              },
+              {
+                  {NAME_FIRST, ""},
+                  {NAME_MIDDLE, ""},
+                  {NAME_LAST, ""},
+                  {NAME_FULL, "Marion Mitchell Morrison"},
+              },
+              {
+                  {NAME_FIRST, "Marion"},
+                  {NAME_MIDDLE, "Mitchell"},
+                  {NAME_LAST, "Morrison"},
+                  {NAME_FULL, "Marion Mitchell Morrison"},
+              },
+          },
+
+          // Test that saving a identical profile except with the name parts set
+          // instead of the full name results in the two profiles being merged
+          // and the full name being kept and all the name parts being added.
+          SaveImportedProfileTestCase{
+              {
+                  {NAME_FIRST, ""},
+                  {NAME_MIDDLE, ""},
+                  {NAME_LAST, ""},
+                  {NAME_FULL, "Marion Mitchell Morrison"},
+              },
+              {
+                  {NAME_FIRST, "Marion"},
+                  {NAME_MIDDLE, "Mitchell"},
+                  {NAME_LAST, "Morrison"},
+                  {NAME_FULL, ""},
+              },
+              {
+                  {NAME_FIRST, "Marion"},
+                  {NAME_MIDDLE, "Mitchell"},
+                  {NAME_LAST, "Morrison"},
+                  {NAME_FULL, "Marion Mitchell Morrison"},
+              },
+          },
+
+          // Test that saving a profile that has only a full name set does not
+          // get merged with a profile with only the name parts set if the names
+          // are different.
+          SaveImportedProfileTestCase{
+              {
+                  {NAME_FIRST, "Marion"},
+                  {NAME_MIDDLE, "Mitchell"},
+                  {NAME_LAST, "Morrison"},
+                  {NAME_FULL, ""},
+              },
+              {
+                  {NAME_FIRST, ""},
+                  {NAME_MIDDLE, ""},
+                  {NAME_LAST, ""},
+                  {NAME_FULL, "John Thompson Smith"},
+              },
+          },
+
+          // Test that saving a profile that has only the name parts set does
+          // not get merged with a profile with only the full name set if the
+          // names are different.
+          SaveImportedProfileTestCase{
+              {
+                  {NAME_FIRST, ""},
+                  {NAME_MIDDLE, ""},
+                  {NAME_LAST, ""},
+                  {NAME_FULL, "John Thompson Smith"},
+              },
+              {
+                  {NAME_FIRST, "Marion"},
+                  {NAME_MIDDLE, "Mitchell"},
+                  {NAME_LAST, "Morrison"},
+                  {NAME_FULL, ""},
+              },
+          },
+
+          // Test that saving an identical profile except for the first address
+          // line results in two profiles being saved.
+          SaveImportedProfileTestCase{
+              ProfileFields(),
+              {{ADDRESS_HOME_LINE1, "123 Aquarium St."}}},
+
+          // Test that saving an identical profile except for the second address
+          // line results in two profiles being saved.
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{ADDRESS_HOME_LINE2, "unit 7"}}},
+
+          // Tests that saving an identical profile that has a new piece of
+          // information (company name) results in a merge and that the original
+          // empty value gets overwritten by the new information.
+          SaveImportedProfileTestCase{{{COMPANY_NAME, ""}},
+                                      ProfileFields(),
+                                      {{COMPANY_NAME, "Fox"}}},
+
+          // Tests that saving an identical profile except a loss of information
+          // results in a merge but the original value is not overwritten (no
+          // information loss).
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{COMPANY_NAME, ""}},
+                                      {{COMPANY_NAME, "Fox"}}},
+
+          // Tests that saving an identical profile except a slightly different
+          // postal code results in a merge with the new value kept.
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_ZIP, "R2C 0A1"}},
+                                      {{ADDRESS_HOME_ZIP, "R2C0A1"}},
+                                      {{ADDRESS_HOME_ZIP, "R2C0A1"}}},
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_ZIP, "R2C0A1"}},
+                                      {{ADDRESS_HOME_ZIP, "R2C 0A1"}},
+                                      {{ADDRESS_HOME_ZIP, "R2C 0A1"}}},
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_ZIP, "r2c 0a1"}},
+                                      {{ADDRESS_HOME_ZIP, "R2C0A1"}},
+                                      {{ADDRESS_HOME_ZIP, "R2C0A1"}}},
+
+          // Tests that saving an identical profile plus a new piece of
+          // information on the address line 2 results in a merge and that the
+          // original empty value gets overwritten by the new information.
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_LINE2, ""}},
+                                      ProfileFields(),
+                                      {{ADDRESS_HOME_LINE2, "unit 5"}}},
+
+          // Tests that saving an identical profile except a loss of information
+          // on the address line 2 results in a merge but that the original
+          // value gets not overwritten (no information loss).
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{ADDRESS_HOME_LINE2, ""}},
+                                      {{ADDRESS_HOME_LINE2, "unit 5"}}},
+
+          // Tests that saving an identical except with more punctuation in the
+          // fist address line, while the second is empty, results in a merge
+          // and that the original address gets overwritten.
+          SaveImportedProfileTestCase{
+              {{ADDRESS_HOME_LINE2, ""}},
+              {{ADDRESS_HOME_LINE2, ""}, {ADDRESS_HOME_LINE1, "123, Zoo St."}},
+              {{ADDRESS_HOME_LINE1, "123, Zoo St."}}},
+
+          // Tests that saving an identical profile except with less punctuation
+          // in the fist address line, while the second is empty, results in a
+          // merge and that the longer address is retained.
+          SaveImportedProfileTestCase{
+              {{ADDRESS_HOME_LINE2, ""}, {ADDRESS_HOME_LINE1, "123, Zoo St."}},
+              {{ADDRESS_HOME_LINE2, ""}},
+              {{ADDRESS_HOME_LINE1, "123 Zoo St"}}},
+
+          // Tests that saving an identical profile except additional
+          // punctuation in the two address lines results in a merge and that
+          // the newer address is retained.
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{ADDRESS_HOME_LINE1, "123, Zoo St."},
+                                       {ADDRESS_HOME_LINE2, "unit. 5"}},
+                                      {{ADDRESS_HOME_LINE1, "123, Zoo St."},
+                                       {ADDRESS_HOME_LINE2, "unit. 5"}}},
+
+          // Tests that saving an identical profile except less punctuation in
+          // the two address lines results in a merge and that the newer address
+          // is retained.
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_LINE1, "123, Zoo St."},
+                                       {ADDRESS_HOME_LINE2, "unit. 5"}},
+                                      ProfileFields(),
+                                      {{ADDRESS_HOME_LINE1, "123 Zoo St"},
+                                       {ADDRESS_HOME_LINE2, "unit 5"}}},
+
+          // Tests that saving an identical profile with accented characters in
+          // the two address lines results in a merge and that the newer address
+          // is retained.
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{ADDRESS_HOME_LINE1, "123 Zôö St"},
+                                       {ADDRESS_HOME_LINE2, "üñìt 5"}},
+                                      {{ADDRESS_HOME_LINE1, "123 Zôö St"},
+                                       {ADDRESS_HOME_LINE2, "üñìt 5"}}},
+
+          // Tests that saving an identical profile without accented characters
+          // in the two address lines results in a merge and that the newer
+          // address is retained.
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_LINE1, "123 Zôö St"},
+                                       {ADDRESS_HOME_LINE2, "üñìt 5"}},
+                                      ProfileFields(),
+                                      {{ADDRESS_HOME_LINE1, "123 Zoo St"},
+                                       {ADDRESS_HOME_LINE2, "unit 5"}}},
+
+          // Tests that saving an identical profile except that the address line
+          // 1 is in the address line 2 results in a merge and that the
+          // multi-lne address is retained.
+          SaveImportedProfileTestCase{
+              ProfileFields(),
+              {{ADDRESS_HOME_LINE1, "123 Zoo St, unit 5"},
+               {ADDRESS_HOME_LINE2, ""}},
+              {{ADDRESS_HOME_LINE1, "123 Zoo St"},
+               {ADDRESS_HOME_LINE2, "unit 5"}}},
+
+          // Tests that saving an identical profile except that the address line
+          // 2 contains part of the old address line 1 results in a merge and
+          // that the original address lines of the reference profile get
+          // overwritten.
+          SaveImportedProfileTestCase{
+              {{ADDRESS_HOME_LINE1, "123 Zoo St, unit 5"},
+               {ADDRESS_HOME_LINE2, ""}},
+              ProfileFields(),
+              {{ADDRESS_HOME_LINE1, "123 Zoo St"},
+               {ADDRESS_HOME_LINE2, "unit 5"}}},
+
+          // Tests that saving an identical profile except that the state is the
+          // abbreviation instead of the full form results in a merge and that
+          // the original state gets overwritten.
+          SaveImportedProfileTestCase{{{ADDRESS_HOME_STATE, "California"}},
+                                      ProfileFields(),
+                                      {{ADDRESS_HOME_STATE, "CA"}}},
+
+          // Tests that saving an identical profile except that the state is the
+          // full form instead of the abbreviation results in a merge and that
+          // the abbreviated state is retained.
+          SaveImportedProfileTestCase{ProfileFields(),
+                                      {{ADDRESS_HOME_STATE, "California"}},
+                                      {{ADDRESS_HOME_STATE, "CA"}}},
+
+          // Tests that saving and identical profile except that the company
+          // name has different punctuation and case results in a merge and that
+          // the syntax of the new profile replaces the old one.
+          SaveImportedProfileTestCase{{{COMPANY_NAME, "Stark inc"}},
+                                      {{COMPANY_NAME, "Stark Inc."}},
+                                      {{COMPANY_NAME, "Stark Inc."}}}));
+
+  // Tests that MergeProfile tries to merge the imported profile into the
+  // existing profile in decreasing order of frecency.
+  TEST_F(PersonalDataManagerTest, MergeProfile_Frecency) {
+    // Create two very similar profiles except with different company names.
+    std::unique_ptr<AutofillProfile> profile1 =
+        base::MakeUnique<AutofillProfile>(base::GenerateGUID(),
+                                          "https://www.example.com");
+    test::SetProfileInfo(profile1.get(), "Homer", "Jay", "Simpson",
+                         "homer.simpson@abc.com", "SNP",
+                         "742 Evergreen Terrace", "", "Springfield", "IL",
+                         "91601", "US", "12345678910");
+    AutofillProfile* profile2 =
+        new AutofillProfile(base::GenerateGUID(), "https://www.example.com");
+    test::SetProfileInfo(profile2, "Homer", "Jay", "Simpson",
+                         "homer.simpson@abc.com", "Fox",
+                         "742 Evergreen Terrace", "", "Springfield", "IL",
+                         "91601", "US", "12345678910");
+
+    // Give the "Fox" profile a bigger frecency score.
+    profile2->set_use_count(15);
+
+    // Create the |existing_profiles| vector.
+    std::vector<std::unique_ptr<AutofillProfile>> existing_profiles;
+    existing_profiles.push_back(std::move(profile1));
+    existing_profiles.push_back(base::WrapUnique(profile2));
+
+    // Create a new imported profile with no company name.
+    AutofillProfile imported_profile(base::GenerateGUID(),
+                                     "https://www.example.com");
+    test::SetProfileInfo(&imported_profile, "Homer", "Jay", "Simpson",
+                         "homer.simpson@abc.com", "", "742 Evergreen Terrace",
+                         "", "Springfield", "IL", "91601", "US", "12345678910");
+
+    // Merge the imported profile into the existing profiles.
+    std::vector<AutofillProfile> profiles;
+    std::string guid = personal_data_->MergeProfile(
+        imported_profile, &existing_profiles, "US-EN", &profiles);
+
+    // The new profile should be merged into the "fox" profile.
+    EXPECT_EQ(profile2->guid(), guid);
 }
 
-// Tests that MergeProfile tries to merge the imported profile into the
-// existing profile in decreasing order of frecency.
-TEST_F(PersonalDataManagerTest, MergeProfile_Frecency) {
-  // Create two very similar profiles except with different company names.
-  std::unique_ptr<AutofillProfile> profile1 = base::MakeUnique<AutofillProfile>(
-      base::GenerateGUID(), "https://www.example.com");
-  test::SetProfileInfo(profile1.get(), "Homer", "Jay", "Simpson",
-                       "homer.simpson@abc.com", "SNP", "742 Evergreen Terrace",
-                       "", "Springfield", "IL", "91601", "US", "12345678910");
-  AutofillProfile* profile2 =
-      new AutofillProfile(base::GenerateGUID(), "https://www.example.com");
-  test::SetProfileInfo(profile2, "Homer", "Jay", "Simpson",
-                       "homer.simpson@abc.com", "Fox", "742 Evergreen Terrace",
-                       "", "Springfield", "IL", "91601", "US", "12345678910");
-
-  // Give the "Fox" profile a bigger frecency score.
-  profile2->set_use_count(15);
-
-  // Create the |existing_profiles| vector.
-  std::vector<std::unique_ptr<AutofillProfile>> existing_profiles;
-  existing_profiles.push_back(std::move(profile1));
-  existing_profiles.push_back(base::WrapUnique(profile2));
-
-  // Create a new imported profile with no company name.
-  AutofillProfile imported_profile(base::GenerateGUID(),
-                                   "https://www.example.com");
-  test::SetProfileInfo(&imported_profile, "Homer", "Jay", "Simpson",
-                       "homer.simpson@abc.com", "", "742 Evergreen Terrace", "",
-                       "Springfield", "IL", "91601", "US", "12345678910");
-
-  // Merge the imported profile into the existing profiles.
-  std::vector<AutofillProfile> profiles;
-  std::string guid = personal_data_->MergeProfile(
-      imported_profile, &existing_profiles, "US-EN", &profiles);
-
-  // The new profile should be merged into the "fox" profile.
-  EXPECT_EQ(profile2->guid(), guid);
-}
-
 // Tests that MergeProfile produces a merged profile with the expected usage
 // statistics.
 // Flaky on TSan, see crbug.com/686226.
 #if defined(THREAD_SANITIZER)
 #define MAYBE_MergeProfile_UsageStats DISABLED_MergeProfile_UsageStats
 #else
 #define MAYBE_MergeProfile_UsageStats MergeProfile_UsageStats
 #endif
 TEST_F(PersonalDataManagerTest, MAYBE_MergeProfile_UsageStats) {
   // Create the test clock and set the time to a specific value.
@@ skipping 1571 matching lines @@
   // to the converted address.
   EXPECT_EQ(profiles[0]->guid(),
             personal_data_->GetCreditCards()[0]->billing_address_id());
   // Make sure that the billing address id of the new server card still refers
   // to the converted address.
   EXPECT_EQ(profiles[0]->guid(),
             personal_data_->GetCreditCards()[1]->billing_address_id());
 }
 
 }  // namespace autofill