More work on removing variants from Autofill

components/autofill/core/browser/contact_info.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/contact_info.h"
 
 #include <stddef.h>
 #include <ostream>
 #include <string>
 
@@ skipping 142 matching lines @@
   if (this == &info)
     return *this;
 
   given_ = info.given_;
   middle_ = info.middle_;
   family_ = info.family_;
   full_ = info.full_;
   return *this;
 }
 
-bool NameInfo::ParsedNamesAreEqual(const NameInfo& info) {
+bool NameInfo::ParsedNamesAreEqual(const NameInfo& info) const {
   l10n::CaseInsensitiveCompare compare;
   return compare.StringsEqual(given_, info.given_) &&
          compare.StringsEqual(middle_, info.middle_) &&
          compare.StringsEqual(family_, info.family_);
 }
 
 void NameInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(NAME_FIRST);
   supported_types->insert(NAME_MIDDLE);
   supported_types->insert(NAME_LAST);
@@ skipping 173 matching lines @@
   return base::string16();
 }
 
 void CompanyInfo::SetRawInfo(ServerFieldType type,
                              const base::string16& value) {
   DCHECK_EQ(COMPANY_NAME, type);
   company_name_ = value;
 }
 
 }  // namespace autofill