[Autofill] Remove (most) support for variants in chrome/browser

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

 // Copyright 2012 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 <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 866 matching lines @@
   ~FakeServerUpdater() { }
 
   AutofillEntry entry_;
   TestProfileSyncService* service_;
   scoped_ptr<WaitableEvent>* wait_for_start_;
   scoped_ptr<WaitableEvent>* wait_for_syncapi_;
   WaitableEvent is_finished_;
   syncer::syncable::Id parent_id_;
 };
 
-namespace {
-
-// Checks if the field of type |field_type| in |profile1| includes all values
-// of the field in |profile2|.
-bool IncludesField(const AutofillProfile& profile1,
-                   const AutofillProfile& profile2,
-                   ServerFieldType field_type) {
-  std::vector<base::string16> values1;
-  profile1.GetRawMultiInfo(field_type, &values1);
-  std::vector<base::string16> values2;
-  profile2.GetRawMultiInfo(field_type, &values2);
-
-  std::set<base::string16> values_set;
-  for (size_t i = 0; i < values1.size(); ++i)
-    values_set.insert(values1[i]);
-  for (size_t i = 0; i < values2.size(); ++i)
-    if (values_set.find(values2[i]) == values_set.end())
-      return false;
-  return true;
-}
-
-} // namespace
-
 // TODO(skrul): Test abort startup.
 // TODO(skrul): Test processing of cloud changes.
 // TODO(tim): Add autofill data type controller test, and a case to cover
 //            waiting for the PersonalDataManager.
 TEST_F(ProfileSyncServiceAutofillTest, FailModelAssociation) {
   // Don't create the root autofill node so startup fails.
   StartSyncService(base::Closure(), true, syncer::AUTOFILL);
   EXPECT_TRUE(sync_service_->HasUnrecoverableError());
 }
 
@@ skipping 210 matching lines @@
   EXPECT_CALL(*personal_data_manager_, Refresh());
   StartSyncService(add_autofill.callback(), false, syncer::AUTOFILL_PROFILE);
   ASSERT_TRUE(add_autofill.success());
 
   std::vector<AutofillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillProfilesFromSyncDBUnderProfileNode(
       &new_sync_profiles));
   ASSERT_EQ(1U, new_sync_profiles.size());
   // Check that key fields are the same.
   EXPECT_TRUE(new_sync_profiles[0].IsSubsetOf(sync_profile, "en-US"));
-  // Check that multivalued fields of the synced back data include original
-  // data.
-  EXPECT_TRUE(
-      IncludesField(new_sync_profiles[0], sync_profile, autofill::NAME_FULL));
-  EXPECT_TRUE(IncludesField(
-      new_sync_profiles[0], sync_profile, autofill::EMAIL_ADDRESS));
-  EXPECT_TRUE(IncludesField(
-      new_sync_profiles[0], sync_profile, autofill::PHONE_HOME_WHOLE_NUMBER));
 }
 
 TEST_F(ProfileSyncServiceAutofillTest, MergeProfileWithDifferentGuid) {
   AutofillProfile sync_profile;
 
   autofill::test::SetProfileInfoWithGuid(&sync_profile,
       "23355099-1170-4B71-8ED4-144470CC9EBE", "Billing",
       "Mitchell", "Morrison",
       "johnwayne@me.xyz", "Fox", "123 Zoo St.", "unit 5", "Hollywood", "CA",
       "91601", "US", "12345678910");
@@ skipping 216 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
              << ", " << sync_entries[i].key().value();
   }
 }