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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 2378 matching lines @@
   ScopedViewUpdates updates(view_.get());
   scoped_ptr<DataModelWrapper> wrapper;
 
   if (static_cast<size_t>(identifier) < popup_suggestion_ids_.size()) {
     const SuggestionBackendID& sid = popup_suggestion_ids_[identifier];
     if (IsCreditCardType(popup_input_type)) {
       wrapper.reset(new AutofillCreditCardWrapper(
           GetManager()->GetCreditCardByGUID(sid.guid)));
     } else {
       wrapper.reset(new AutofillProfileWrapper(
-          GetManager()->GetProfileByGUID(sid.guid),
-          AutofillType(popup_input_type),
-          sid.variant));
+          GetManager()->GetProfileByGUID(sid.guid)));
     }
   } else {
     wrapper.reset(new I18nAddressDataWrapper(
         &i18n_validator_suggestions_[
             identifier - popup_suggestion_ids_.size()]));
   }
 
   // If the user hasn't switched away from the default country and |wrapper|'s
   // country differs from the |view_|'s, rebuild inputs and restore user data.
   const FieldValueMap snapshot = TakeUserInputSnapshot();
@@ skipping 637 matching lines @@
           g_browser_process->GetApplicationLocale(),
           &labels);
       DCHECK_EQ(labels.size(), profiles.size());
       for (size_t i = 0; i < profiles.size(); ++i) {
         const AutofillProfile& profile = *profiles[i];
         if (!i18ninput::AddressHasCompleteAndVerifiedData(
                 profile, g_browser_process->GetApplicationLocale())) {
           continue;
         }
 
-        // Don't add variants for addresses: name is part of credit card and
-        // we'll just ignore email and phone number variants.
         suggested_shipping_.AddKeyedItem(profile.guid(), labels[i]);
         suggested_shipping_.SetEnabled(
             profile.guid(),
             CanAcceptCountry(
                 SECTION_SHIPPING,
                 base::UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))));
         if (!profile.GetRawInfo(EMAIL_ADDRESS).empty() &&
             !profile.IsPresentButInvalid(EMAIL_ADDRESS)) {
           suggested_billing_.AddKeyedItem(profile.guid(), labels[i]);
           suggested_billing_.SetEnabled(
@@ skipping 1046 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill