Use server ID to identify server cards.

chrome/browser/autofill/android/personal_data_manager_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_
 #define CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
@@ skipping 95 matching lines @@
       const base::android::JavaParamRef<jstring>& jcard_number);
 
   // Adds or modifies a local credit card.  If |jguid| is an empty string, we
   // are creating a new card.  Else we are updating an existing profile.  Always
   // returns the GUID for this profile; the GUID it may have just been created.
   base::android::ScopedJavaLocalRef<jstring> SetCreditCard(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jobject>& jcard);
 
-  // Updates the billing address of a server credit card with GUID |jguid|.
+  // Updates the billing address of a server credit card with server ID
+  // |jcard_server_id|.
   void UpdateServerCardBillingAddress(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
-      const base::android::JavaParamRef<jstring>& jguid,
+      const base::android::JavaParamRef<jstring>& jcard_server_id,
       const base::android::JavaParamRef<jstring>& jbilling_address_id);
 
   // Returns the card type according to PaymentRequest spec, or an empty string
   // if the given card number is not valid.
   base::android::ScopedJavaLocalRef<jstring> GetBasicCardPaymentTypeIfValid(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jstring>& jcard_number);
 
   // Adds a server credit card. Used only in tests.
@@ skipping 15 matching lines @@
 
   // Gets the card CVC and expiration date (if it's expired). If the card is
   // masked, unmasks it. If the user has entered new expiration date, the new
   // date is saved on disk.
   //
   // The full card details are sent to the delegate.
   void GetFullCardForPaymentRequest(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& unused_obj,
       const base::android::JavaParamRef<jobject>& jweb_contents,
-      const base::android::JavaParamRef<jstring>& jguid,
-      const base::android::JavaParamRef<jobject>& jdelegate);
-
-  // Gets the card CVC and expiration date (if it's expired) for a card that's
-  // temporary and not stored on disk. No unmasking is performed. If the user
-  // has entered new expiration date, the new date is not saved on disk, because
-  // this card is temporary.
-  //
-  // The card number, name on card, and expiration date are used for UI display
-  // and are sent to the delegate after user confirms their CVC.
-  void GetFullTemporaryCardForPaymentRequest(
-      JNIEnv* env,
-      const base::android::JavaParamRef<jobject>& unused_obj,
-      const base::android::JavaParamRef<jobject>& jweb_contents,
-      const base::android::JavaParamRef<jstring>& jcard_number,
-      const base::android::JavaParamRef<jstring>& jname_on_card,
-      const base::android::JavaParamRef<jstring>& jexpiration_month,
-      const base::android::JavaParamRef<jstring>& jexpiration_year,
+      const base::android::JavaParamRef<jobject>& jcard,
       const base::android::JavaParamRef<jobject>& jdelegate);
 
   // PersonalDataManagerObserver:
   void OnPersonalDataChanged() override;
 
   // Registers the JNI bindings for this class.
   static bool Register(JNIEnv* env);
 
   // These functions act on the usage stats of local profiles and credit cards.
   // --------------------
@@ skipping 105 matching lines @@
 
   // Pointer to the PersonalDataManager for the main profile.
   PersonalDataManager* personal_data_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_AUTOFILL_ANDROID_PERSONAL_DATA_MANAGER_ANDROID_H_