Revert of [Reland] Use dropdown list for admin areas in pr form.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 511 matching lines @@
 
         // Limit the number of suggestions.
         addresses = addresses.subList(0, Math.min(addresses.size(), SUGGESTIONS_LIMIT));
 
         // Load the validation rules for each unique region code.
         Set<String> uniqueCountryCodes = new HashSet<>();
         for (int i = 0; i < addresses.size(); ++i) {
             String countryCode = AutofillAddress.getCountryCode(addresses.get(i).getProfile());
             if (!uniqueCountryCodes.contains(countryCode)) {
                 uniqueCountryCodes.add(countryCode);
-                PersonalDataManager.getInstance().loadRulesForAddressNormalization(countryCode);
+                PersonalDataManager.getInstance().loadRulesForRegion(countryCode);
             }
         }
 
         // Log the number of suggested shipping addresses.
         mJourneyLogger.setNumberOfSuggestionsShown(
                 JourneyLogger.SECTION_SHIPPING_ADDRESS, addresses.size());
 
         // Automatically select the first address if one is complete and if the merchant does
         // not require a shipping address to calculate shipping costs.
         int firstCompleteAddressIndex = SectionInformation.NO_SELECTION;
@@ skipping 837 matching lines @@
         // addresses and check for validity.
         Set<String> uniqueCountryCodes = new HashSet<>();
         for (int i = 0; i < mPendingAutofillInstruments.size(); ++i) {
             assert mPendingAutofillInstruments.get(i) instanceof AutofillPaymentInstrument;
             AutofillPaymentInstrument creditCard =
                     (AutofillPaymentInstrument) mPendingAutofillInstruments.get(i);
 
             String countryCode = AutofillAddress.getCountryCode(creditCard.getBillingAddress());
             if (!uniqueCountryCodes.contains(countryCode)) {
                 uniqueCountryCodes.add(countryCode);
-                PersonalDataManager.getInstance().loadRulesForAddressNormalization(countryCode);
+                PersonalDataManager.getInstance().loadRulesForRegion(countryCode);
             }
 
             // If there's a card on file with a valid number and a name, then
             // PaymentRequest.canMakePayment() returns true.
             mCanMakePayment |= creditCard.isValidCard();
         }
 
         // List order:
         // > Non-autofill instruments.
         // > Complete autofill instruments.
@@ skipping 286 matching lines @@
 
     /**
      * The frecency score is calculated according to use count and last use date. The formula is
      * the same as the one used in GetFrecencyScore in autofill_data_model.cc.
      */
     private static final double getFrecencyScore(int count, long date) {
         long currentTime = System.currentTimeMillis();
         return -Math.log((currentTime - date) / (24 * 60 * 60 * 1000) + 2) / Math.log(count + 2);
     }
 }