Revert of Credit card editor for PaymentRequest UI.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
index 8fae08fd55c4afe2661b27d80848810ec2778320..85dec0b2e464130597040576d761f3520b07866e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java
@@ -115,15 +115,26 @@
 
         /**
          * Builds an empty local profile with "settings" origin and country code from the default
-         * locale. All other fields are empty strings, because JNI does not handle null strings.
+         * locale. All other fields are empty strings, because JNI does not handle nulls.
          */
         public AutofillProfile() {
-            this("" /* guid */, AutofillPreferences.SETTINGS_ORIGIN /* origin */,
-                    true /* isLocal */, "" /* fullName */, "" /* companyName */,
-                    "" /* streetAddress */, "" /* region */, "" /* locality */,
-                    "" /* dependentLocality */, "" /* postalCode */, "" /* sortingCode */,
-                    Locale.getDefault().getCountry() /* country */, "" /* phoneNumber */,
-                    "" /* emailAddress */, "" /* languageCode */);
+            mOrigin = AutofillPreferences.SETTINGS_ORIGIN;
+            mIsLocal = true;
+            mCountryCode = Locale.getDefault().getCountry();
+
+            mGUID = "";
+            mFullName = "";
+            mCompanyName = "";
+            mStreetAddress = "";
+            mRegion = "";
+            mLocality = "";
+            mDependentLocality = "";
+            mPostalCode = "";
+            mSortingCode = "";
+            mPhoneNumber = "";
+            mEmailAddress = "";
+            mLabel = "";
+            mLanguageCode = "";
         }
 
         /** TODO(estade): remove this constructor. */
@@ -132,9 +143,21 @@
                 String streetAddress, String region, String locality, String dependentLocality,
                 String postalCode, String sortingCode, String countryCode, String phoneNumber,
                 String emailAddress, String languageCode) {
-            this(guid, origin, true /* isLocal */, fullName, companyName, streetAddress, region,
-                    locality, dependentLocality, postalCode, sortingCode, countryCode, phoneNumber,
-                    emailAddress, languageCode);
+            mGUID = guid;
+            mOrigin = origin;
+            mIsLocal = true;
+            mFullName = fullName;
+            mCompanyName = companyName;
+            mStreetAddress = streetAddress;
+            mRegion = region;
+            mLocality = locality;
+            mDependentLocality = dependentLocality;
+            mPostalCode = postalCode;
+            mSortingCode = sortingCode;
+            mCountryCode = countryCode;
+            mPhoneNumber = phoneNumber;
+            mEmailAddress = emailAddress;
+            mLanguageCode = languageCode;
         }
 
         @CalledByNative("AutofillProfile")
@@ -332,20 +355,20 @@
             mBillingAddressId = billingAddressId;
         }
 
-        public CreditCard() {
-            this("" /* guid */, AutofillPreferences.SETTINGS_ORIGIN /*origin */, true /* isLocal */,
-                    false /* isCached */, "" /* name */, "" /* number */, "" /* obfuscatedNumber */,
-                    "" /* month */, "" /* year */, "" /* basicCardPaymentType */,
-                    0 /* issuerIconDrawableId */, "" /* billingAddressId */);
-        }
-
         /** 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 */,
-                    0 /* issuerIconDrawableId */, "" /* billingAddressId */);
+            mGUID = guid;
+            mOrigin = origin;
+            mIsLocal = true;
+            mIsCached = false;
+            mName = name;
+            mNumber = number;
+            mObfuscatedNumber = obfuscatedNumber;
+            mMonth = month;
+            mYear = year;
+            mBillingAddressId = "";
         }
 
         @CalledByNative("CreditCard")
@@ -438,14 +461,6 @@
 
         public void setYear(String year) {
             mYear = year;
-        }
-
-        public void setBasicCardPaymentType(String type) {
-            mBasicCardPaymentType = type;
-        }
-
-        public void setIssuerIconDrawableId(int id) {
-            mIssuerIconDrawableId = id;
         }
 
         public void setBillingAddressId(String id) {
@@ -584,11 +599,6 @@
         return nativeGetCreditCardByGUID(mPersonalDataManagerAndroid, guid);
     }
 
-    public CreditCard getCreditCardForNumber(String cardNumber) {
-        ThreadUtils.assertOnUiThread();
-        return nativeGetCreditCardForNumber(mPersonalDataManagerAndroid, cardNumber);
-    }
-
     public String setCreditCard(CreditCard card) {
         ThreadUtils.assertOnUiThread();
         assert card.getIsLocal();
@@ -600,11 +610,6 @@
         nativeUpdateServerCardBillingAddress(mPersonalDataManagerAndroid, guid, billingAddressId);
     }
 
-    public String getBasicCardPaymentTypeIfValid(String cardNumber) {
-        ThreadUtils.assertOnUiThread();
-        return nativeGetBasicCardPaymentTypeIfValid(mPersonalDataManagerAndroid, cardNumber);
-    }
-
     @VisibleForTesting
     public void addServerCreditCardForTest(CreditCard card) {
         ThreadUtils.assertOnUiThread();
@@ -621,7 +626,7 @@
         nativeClearUnmaskedCache(mPersonalDataManagerAndroid, guid);
     }
 
-    public String getAddressLabelForPaymentRequest(AutofillProfile profile) {
+    public String getGetAddressLabelForPaymentRequest(AutofillProfile profile) {
         return nativeGetAddressLabelForPaymentRequest(mPersonalDataManagerAndroid, profile);
     }
 
@@ -629,12 +634,6 @@
             FullCardRequestDelegate delegate) {
         nativeGetFullCardForPaymentRequest(
                 mPersonalDataManagerAndroid, webContents, guid, delegate);
-    }
-
-    public void getFullTemporaryCard(WebContents webContents, String cardNumber, String nameOnCard,
-            String expirationMonth, String expirationYear, FullCardRequestDelegate delegate) {
-        nativeGetFullTemporaryCardForPaymentRequest(mPersonalDataManagerAndroid, webContents,
-                cardNumber, nameOnCard, expirationMonth, expirationYear, delegate);
     }
 
     @VisibleForTesting
@@ -704,14 +703,10 @@
             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,
             String guid, String billingAddressId);
-    private native String nativeGetBasicCardPaymentTypeIfValid(
-            long nativePersonalDataManagerAndroid, String cardNumber);
     private native void nativeAddServerCreditCardForTest(long nativePersonalDataManagerAndroid,
             CreditCard card);
     private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid);
@@ -723,10 +718,6 @@
             long nativePersonalDataManagerAndroid, String guid);
     private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
             WebContents webContents, String guid, FullCardRequestDelegate delegate);
-    private native void nativeGetFullTemporaryCardForPaymentRequest(
-            long nativePersonalDataManagerAndroid, WebContents webContents, String cardNumber,
-            String nameOnCard, String expirationMonth, String expirationYear,
-            FullCardRequestDelegate delegate);
     private static native boolean nativeIsAutofillEnabled();
     private static native void nativeSetAutofillEnabled(boolean enable);
     private static native boolean nativeIsAutofillManaged();