Rename card 'type' into 'issuer network.'

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

 // 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.
 
 package org.chromium.chrome.browser.autofill;
 
 import android.content.Context;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
@@ skipping 328 matching lines @@
         // marshaled and compared as strings. To save conversions, we use strings everywhere.
         private String mGUID;
         private String mOrigin;
         private boolean mIsLocal;
         private boolean mIsCached;
         private String mName;
         private String mNumber;
         private String mObfuscatedNumber;
         private String mMonth;
         private String mYear;
-        private String mBasicCardPaymentType;
+        private String mBasicCardIssuerNetwork;
         private int mIssuerIconDrawableId;
         private String mBillingAddressId;
         private String mServerId;
 
         @CalledByNative("CreditCard")
         public static CreditCard create(String guid, String origin, boolean isLocal,
                 boolean isCached, String name, String number, String obfuscatedNumber, String month,
-                String year, String basicCardPaymentType, int enumeratedIconId,
+                String year, String basicCardIssuerNetwork, int enumeratedIconId,
                 String billingAddressId, String serverId) {
             return new CreditCard(guid, origin, isLocal, isCached, name, number, obfuscatedNumber,
-                    month, year, basicCardPaymentType, ResourceId.mapToDrawableId(enumeratedIconId),
-                    billingAddressId, serverId);
+                    month, year, basicCardIssuerNetwork,
+                    ResourceId.mapToDrawableId(enumeratedIconId), billingAddressId, serverId);
         }
 
         public CreditCard(String guid, String origin, boolean isLocal, boolean isCached,
                 String name, String number, String obfuscatedNumber, String month, String year,
-                String basicCardPaymentType, int issuerIconDrawableId, String billingAddressId,
+                String basicCardIssuerNetwork, int issuerIconDrawableId, String billingAddressId,
                 String serverId) {
             mGUID = guid;
             mOrigin = origin;
             mIsLocal = isLocal;
             mIsCached = isCached;
             mName = name;
             mNumber = number;
             mObfuscatedNumber = obfuscatedNumber;
             mMonth = month;
             mYear = year;
-            mBasicCardPaymentType = basicCardPaymentType;
+            mBasicCardIssuerNetwork = basicCardIssuerNetwork;
             mIssuerIconDrawableId = issuerIconDrawableId;
             mBillingAddressId = billingAddressId;
             mServerId = serverId;
         }
 
         public CreditCard() {
             this("" /* guid */, AutofillAndPaymentsPreferences.SETTINGS_ORIGIN /*origin */,
                     true /* isLocal */, false /* isCached */, "" /* name */, "" /* number */,
                     "" /* obfuscatedNumber */, "" /* month */, "" /* year */,
-                    "" /* basicCardPaymentType */, 0 /* issuerIconDrawableId */,
+                    "" /* basicCardIssuerNetwork */, 0 /* issuerIconDrawableId */,
                     "" /* billingAddressId */, "" /* serverId */);
         }
 
         /** TODO(estade): remove this constructor. */
         @VisibleForTesting
         public CreditCard(String guid, String origin, String name, String number,
                 String obfuscatedNumber, String month, String year) {
             this(guid, origin, true /* isLocal */, false /* isCached */, name, number,
-                    obfuscatedNumber, month, year, "" /* basicCardPaymentType */,
+                    obfuscatedNumber, month, year, "" /* basicCardIssuerNetwork */,
                     0 /* issuerIconDrawableId */, "" /* billingAddressId */, "" /* serverId */);
         }
 
         @CalledByNative("CreditCard")
         public String getGUID() {
             return mGUID;
         }
 
         @CalledByNative("CreditCard")
         public String getOrigin() {
@@ skipping 34 matching lines @@
         public boolean getIsLocal() {
             return mIsLocal;
         }
 
         @CalledByNative("CreditCard")
         public boolean getIsCached() {
             return mIsCached;
         }
 
         @CalledByNative("CreditCard")
-        public String getBasicCardPaymentType() {
-            return mBasicCardPaymentType;
+        public String getBasicCardIssuerNetwork() {
+            return mBasicCardIssuerNetwork;
         }
 
         public int getIssuerIconDrawableId() {
             return mIssuerIconDrawableId;
         }
 
         @CalledByNative("CreditCard")
         public String getBillingAddressId() {
             return mBillingAddressId;
         }
@@ skipping 27 matching lines @@
 
         @VisibleForTesting
         public void setMonth(String month) {
             mMonth = month;
         }
 
         public void setYear(String year) {
             mYear = year;
         }
 
-        public void setBasicCardPaymentType(String type) {
-            mBasicCardPaymentType = type;
+        public void setBasicCardIssuerNetwork(String network) {
+            mBasicCardIssuerNetwork = network;
         }
 
         public void setIssuerIconDrawableId(int id) {
             mIssuerIconDrawableId = id;
         }
 
         public void setBillingAddressId(String id) {
             mBillingAddressId = id;
         }
     }
@@ skipping 173 matching lines @@
         ThreadUtils.assertOnUiThread();
         assert card.getIsLocal();
         return nativeSetCreditCard(mPersonalDataManagerAndroid, card);
     }
 
     public void updateServerCardBillingAddress(CreditCard card) {
         ThreadUtils.assertOnUiThread();
         nativeUpdateServerCardBillingAddress(mPersonalDataManagerAndroid, card);
     }
 
-    public String getBasicCardPaymentType(String cardNumber, boolean emptyIfInvalid) {
+    public String getBasicCardIssuerNetwork(String cardNumber, boolean emptyIfInvalid) {
         ThreadUtils.assertOnUiThread();
-        return nativeGetBasicCardPaymentType(
+        return nativeGetBasicCardIssuerNetwork(
                 mPersonalDataManagerAndroid, cardNumber, emptyIfInvalid);
     }
 
     @VisibleForTesting
     public void addServerCreditCardForTest(CreditCard card) {
         ThreadUtils.assertOnUiThread();
         assert !card.getIsLocal();
         nativeAddServerCreditCardForTest(mPersonalDataManagerAndroid, card);
     }
 
@@ skipping 206 matching lines @@
     private native String[] nativeGetCreditCardGUIDsToSuggest(
             long nativePersonalDataManagerAndroid);
     private native CreditCard nativeGetCreditCardByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native CreditCard nativeGetCreditCardForNumber(long nativePersonalDataManagerAndroid,
             String cardNumber);
     private native String nativeSetCreditCard(long nativePersonalDataManagerAndroid,
             CreditCard card);
     private native void nativeUpdateServerCardBillingAddress(long nativePersonalDataManagerAndroid,
             CreditCard card);
-    private native String nativeGetBasicCardPaymentType(
+    private native String nativeGetBasicCardIssuerNetwork(
             long nativePersonalDataManagerAndroid, String cardNumber, boolean emptyIfInvalid);
     private native void nativeAddServerCreditCardForTest(long nativePersonalDataManagerAndroid,
             CreditCard card);
     private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid);
     private native void nativeRecordAndLogProfileUse(long nativePersonalDataManagerAndroid,
             String guid);
     private native void nativeSetProfileUseStatsForTesting(
             long nativePersonalDataManagerAndroid, String guid, int count, long date);
     private native int nativeGetProfileUseCountForTesting(long nativePersonalDataManagerAndroid,
             String guid);
@@ skipping 19 matching lines @@
             NormalizedAddressRequestDelegate delegate);
     private static native boolean nativeHasProfiles(long nativePersonalDataManagerAndroid);
     private static native boolean nativeHasCreditCards(long nativePersonalDataManagerAndroid);
     private static native boolean nativeIsAutofillEnabled();
     private static native void nativeSetAutofillEnabled(boolean enable);
     private static native boolean nativeIsAutofillManaged();
     private static native boolean nativeIsPaymentsIntegrationEnabled();
     private static native void nativeSetPaymentsIntegrationEnabled(boolean enable);
     private static native String nativeToCountryCode(String countryName);
 }