Revert of Credit card editor for PaymentRequest UI.

chrome/browser/autofill/android/personal_data_manager_android.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/autofill/android/personal_data_manager_android.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ skipping 13 matching lines @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/payments/full_card_request.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
-#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_scaled_resources.h"
 #include "jni/PersonalDataManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
@@ skipping 86 matching lines @@
                   Java_AutofillProfile_getPhoneNumber(env, jprofile.obj()));
   MaybeSetRawInfo(profile, autofill::EMAIL_ADDRESS,
                   Java_AutofillProfile_getEmailAddress(env, jprofile.obj()));
   profile->set_language_code(
       ConvertJavaStringToUTF8(
           Java_AutofillProfile_getLanguageCode(env, jprofile.obj())));
 }
 
 // Mapping from Chrome card types to PaymentRequest basic card payment spec and
 // icons. Note that "generic" is not in the spec.
-// https://w3c.github.io/webpayments-methods-card/#method-id
+// https://w3c.github.io/browser-payment-api/specs/basic-card-payment.html#method-id
 const struct PaymentRequestData {
   const char* card_type;
   const char* basic_card_payment_type;
   const int icon_resource_id;
 } kPaymentRequestData[] {
   {"genericCC", "generic", IDR_AUTOFILL_PR_GENERIC},
-
   {"americanExpressCC", "amex", IDR_AUTOFILL_PR_AMEX},
-  {"dinersCC", "diners", IDR_AUTOFILL_PR_DINERS},
+  {"dinersCC", "diners", IDR_AUTOFILL_PR_GENERIC},
   {"discoverCC", "discover", IDR_AUTOFILL_PR_DISCOVER},
-  {"jcbCC", "jcb", IDR_AUTOFILL_PR_JCB},
+  {"jcbCC", "jcb", IDR_AUTOFILL_PR_GENERIC},
   {"masterCardCC", "mastercard", IDR_AUTOFILL_PR_MASTERCARD},
-  {"unionPayCC", "unionpay", IDR_AUTOFILL_PR_UNIONPAY},
-  {"visaCC", "visa", IDR_AUTOFILL_PR_VISA},
+  {"visaCC", "visa", IDR_AUTOFILL_PR_VISA}
 };
 
 // Converts the card type into PaymentRequest type according to the basic card
 // payment spec and an icon. Will set the type and the icon to "generic" for
 // unrecognized card type.
 const PaymentRequestData& GetPaymentRequestData(const std::string& type) {
   for (size_t i = 0; i < arraysize(kPaymentRequestData); ++i) {
     if (type == kPaymentRequestData[i].card_type)
       return kPaymentRequestData[i];
   }
@@ skipping 47 matching lines @@
       ConvertJavaStringToUTF8(Java_CreditCard_getBillingAddressId(env, jcard)));
 }
 
 // Self-deleting requester of full card details, including full PAN and the CVC
 // number.
 class FullCardRequester : public payments::FullCardRequest::Delegate,
                           public base::SupportsWeakPtr<FullCardRequester> {
  public:
   FullCardRequester() {}
 
-  // Takes ownership of |card|.
   void GetFullCard(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& jweb_contents,
                    const base::android::JavaParamRef<jobject>& jdelegate,
-                   std::unique_ptr<CreditCard> card) {
-    card_ = std::move(card);
-    GetFullCard(env, jweb_contents, jdelegate, card_.get());
-  }
-
-  // Does not take ownership of |card|.
-  void GetFullCard(JNIEnv* env,
-                   const base::android::JavaParamRef<jobject>& jweb_contents,
-                   const base::android::JavaParamRef<jobject>& jdelegate,
-                   const CreditCard* card) {
+                   CreditCard* card) {
     jdelegate_.Reset(env, jdelegate);
 
     if (!card) {
       OnFullCardError();
       return;
     }
 
     content::WebContents* contents =
         content::WebContents::FromJavaWebContents(jweb_contents);
     if (!contents) {
@@ skipping 32 matching lines @@
     delete this;
   }
 
   // payments::FullCardRequest::Delegate:
   void OnFullCardError() override {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_FullCardRequestDelegate_onFullCardError(env, jdelegate_.obj());
     delete this;
   }
 
-  std::unique_ptr<CreditCard> card_;
   ScopedJavaGlobalRef<jobject> jdelegate_;
 
   DISALLOW_COPY_AND_ASSIGN(FullCardRequester);
 };
 
 }  // namespace
 
 PersonalDataManagerAndroid::PersonalDataManagerAndroid(JNIEnv* env,
                                                        jobject obj)
     : weak_java_obj_(env, obj),
@@ skipping 114 matching lines @@
     const JavaParamRef<jobject>& unused_obj,
     const JavaParamRef<jstring>& jguid) {
   CreditCard* card = personal_data_manager_->GetCreditCardByGUID(
           ConvertJavaStringToUTF8(env, jguid));
   if (!card)
     return ScopedJavaLocalRef<jobject>();
 
   return CreateJavaCreditCardFromNative(env, *card);
 }
 
-ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardForNumber(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jcard_number) {
-  // A local card with empty GUID.
-  CreditCard card("", "");
-  card.SetNumber(ConvertJavaStringToUTF16(env, jcard_number));
-  return CreateJavaCreditCardFromNative(env, card);
-}
-
 ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard(
     JNIEnv* env,
     const JavaParamRef<jobject>& unused_obj,
     const JavaParamRef<jobject>& jcard) {
   std::string guid = ConvertJavaStringToUTF8(
        env,
        Java_CreditCard_getGUID(env, jcard).obj());
 
   CreditCard card;
   PopulateNativeCreditCardFromJava(jcard, env, &card);
@@ skipping 13 matching lines @@
     const JavaParamRef<jobject>& unused_obj,
     const JavaParamRef<jstring>& jguid,
     const JavaParamRef<jstring>& jbilling_address_id) {
   CreditCard card(ConvertJavaStringToUTF8(env, jguid), kSettingsOrigin);
   card.set_record_type(CreditCard::MASKED_SERVER_CARD);
   card.set_billing_address_id(ConvertJavaStringToUTF8(env,
       jbilling_address_id));
   personal_data_manager_->UpdateServerCardBillingAddress(card);
 }
 
-ScopedJavaLocalRef<jstring>
-PersonalDataManagerAndroid::GetBasicCardPaymentTypeIfValid(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jstring>& jcard_number) {
-  base::string16 card_number = ConvertJavaStringToUTF16(env, jcard_number);
-  return ConvertUTF8ToJavaString(
-      env,
-      IsValidCreditCardNumber(card_number)
-          ? GetPaymentRequestData(CreditCard::GetCreditCardType(card_number))
-                .basic_card_payment_type
-          : "");
-}
-
 void PersonalDataManagerAndroid::AddServerCreditCardForTest(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& unused_obj,
     const base::android::JavaParamRef<jobject>& jcard) {
   std::unique_ptr<CreditCard> card(new CreditCard);
   PopulateNativeCreditCardFromJava(jcard, env, card.get());
   card->set_record_type(CreditCard::MASKED_SERVER_CARD);
   personal_data_manager_->AddServerCreditCardForTest(std::move(card));
 }
 
@@ skipping 11 matching lines @@
   personal_data_manager_->ResetFullServerCard(
       ConvertJavaStringToUTF8(env, guid));
 }
 
 void PersonalDataManagerAndroid::GetFullCardForPaymentRequest(
     JNIEnv* env,
     const JavaParamRef<jobject>& unused_obj,
     const JavaParamRef<jobject>& jweb_contents,
     const JavaParamRef<jstring>& jguid,
     const JavaParamRef<jobject>& jdelegate) {
-  // Self-deleting object that does not take ownership of the CreditCard from
-  // the PersonalDataManager. The PersonalDataManager owns that CreditCard.
+  // Self-deleting object.
   (new FullCardRequester())
       ->GetFullCard(env, jweb_contents, jdelegate,
                     personal_data_manager_->GetCreditCardByGUID(
                         ConvertJavaStringToUTF8(env, jguid)));
 }
 
-void PersonalDataManagerAndroid::GetFullTemporaryCardForPaymentRequest(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& unused_obj,
-    const JavaParamRef<jobject>& jweb_contents,
-    const JavaParamRef<jstring>& jcard_number,
-    const JavaParamRef<jstring>& jname_on_card,
-    const JavaParamRef<jstring>& jexpiration_month,
-    const JavaParamRef<jstring>& jexpiration_year,
-    const JavaParamRef<jobject>& jdelegate) {
-  // FullCardRequest will not attempt to save a card with an empty GUID.
-  std::unique_ptr<CreditCard> card(new CreditCard("", ""));
-  card->SetNumber(ConvertJavaStringToUTF16(env, jcard_number));
-  card->SetRawInfo(
-      CREDIT_CARD_NAME_FULL,
-      ConvertJavaStringToUTF16(env, jname_on_card));
-  card->SetRawInfo(
-      CREDIT_CARD_EXP_MONTH,
-      ConvertJavaStringToUTF16(env, jexpiration_month));
-  card->SetRawInfo(
-      CREDIT_CARD_EXP_4_DIGIT_YEAR,
-      ConvertJavaStringToUTF16(env, jexpiration_year));
-
-  // Self-deleting object that takes ownership of the CreditCard.
-  (new FullCardRequester())
-      ->GetFullCard(env, jweb_contents, jdelegate, std::move(card));
-}
-
 void PersonalDataManagerAndroid::OnPersonalDataChanged() {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (weak_java_obj_.get(env).is_null())
     return;
 
   Java_PersonalDataManager_personalDataChanged(env,
                                                weak_java_obj_.get(env).obj());
 }
 
 // static
@@ skipping 128 matching lines @@
                base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill