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

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 84 matching lines @@
       base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)),
       GetLanguageCode(),
       g_browser_process->GetApplicationLocale());
 }
 
 DataModelWrapper::DataModelWrapper() {}
 
 // AutofillProfileWrapper
 
 AutofillProfileWrapper::AutofillProfileWrapper(const AutofillProfile* profile)
-    : profile_(profile),
-      variant_group_(NO_GROUP),
-      variant_(0) {}
-
-AutofillProfileWrapper::AutofillProfileWrapper(
-    const AutofillProfile* profile,
-    const AutofillType& type,
-    size_t variant)
-    : profile_(profile),
-      variant_group_(type.group()),
-      variant_(variant) {}
+    : profile_(profile) {}
 
 AutofillProfileWrapper::~AutofillProfileWrapper() {}
 
 base::string16 AutofillProfileWrapper::GetInfo(const AutofillType& type) const {
   // Requests for the user's credit card are filled from the billing address,
   // but the AutofillProfile class doesn't know how to fill credit card
   // fields. So, request for the corresponding profile type instead.
   AutofillType effective_type = type;
   if (type.GetStorableType() == CREDIT_CARD_NAME)
     effective_type = AutofillType(NAME_BILLING_FULL);
 
-  size_t variant = GetVariantForType(effective_type);
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
-  return profile_->GetInfoForVariant(effective_type, variant, app_locale);
+  return profile_->GetInfo(effective_type, app_locale);
 }
 
 base::string16 AutofillProfileWrapper::GetInfoForDisplay(
     const AutofillType& type) const {
   // We display the "raw" phone number which contains user-defined formatting.
   if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER) {
-    std::vector<base::string16> values;
-    profile_->GetRawMultiInfo(type.GetStorableType(), &values);
-    const base::string16& phone_number = values[GetVariantForType(type)];
+    base::string16 phone_number = profile_->GetRawInfo(type.GetStorableType());
 
     // If there is no user-defined formatting at all, add some standard
     // formatting.
     if (base::ContainsOnlyChars(phone_number,
                                 base::ASCIIToUTF16("+0123456789"))) {
       std::string region = base::UTF16ToASCII(
           GetInfo(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE)));
       i18n::PhoneObject phone(phone_number, region);
       base::string16 formatted_number = phone.GetFormattedNumber();
       // Formatting may fail.
       if (!formatted_number.empty())
         return formatted_number;
     }
 
     return phone_number;
   }
 
   return DataModelWrapper::GetInfoForDisplay(type);
 }
 
 const std::string& AutofillProfileWrapper::GetLanguageCode() const {
   return profile_->language_code();
 }
 
-size_t AutofillProfileWrapper::GetVariantForType(const AutofillType& type)
-    const {
-  if (type.group() == variant_group_)
-    return variant_;
-
-  return 0;
-}
-
 // AutofillShippingAddressWrapper
 
 AutofillShippingAddressWrapper::AutofillShippingAddressWrapper(
     const AutofillProfile* profile)
     : AutofillProfileWrapper(profile) {}
 
 AutofillShippingAddressWrapper::~AutofillShippingAddressWrapper() {}
 
 base::string16 AutofillShippingAddressWrapper::GetInfo(
     const AutofillType& type) const {
@@ skipping 215 matching lines @@
   }
 
   return base::UTF8ToUTF16(address_->GetFieldValue(field));
 }
 
 const std::string& I18nAddressDataWrapper::GetLanguageCode() const {
   return address_->language_code;
 }
 
 }  // namespace autofill