[Payment Request] Refactors the edit view controller

ios/chrome/browser/ui/payments/credit_card_edit_view_controller.h

Index: ios/chrome/browser/ui/payments/credit_card_edit_view_controller.h
diff --git a/ios/chrome/browser/ui/payments/credit_card_edit_view_controller.h b/ios/chrome/browser/ui/payments/credit_card_edit_view_controller.h
index d3c1114b17d3e743dc9f1946cce6d1b7d91d0e30..5561699d687b48ca5109cbe3ec16632cacf91c91 100644
--- a/ios/chrome/browser/ui/payments/credit_card_edit_view_controller.h
+++ b/ios/chrome/browser/ui/payments/credit_card_edit_view_controller.h
@@ -11,13 +11,13 @@
 @class CreditCardEditViewController;
 
 // Delegate protocol for CreditCardEditViewController.
-@protocol CreditCardEditViewControllerDelegate<NSObject>
+@protocol CreditCardEditViewControllerDelegate<
+    PaymentRequestEditViewControllerDelegate>
 
 // Notifies the delegate that the user has finished editing the credit card
 // editor fields.
 - (void)creditCardEditViewController:(CreditCardEditViewController*)controller
               didFinishEditingFields:(NSArray<EditorField*>*)fields
-                    billingAddressID:(NSString*)billingAddressID
                       saveCreditCard:(BOOL)saveCard;
 
 // Notifies the delegate that the user has chosen to discard entries in the
@@ -41,9 +41,6 @@
 @property(nonatomic, weak) id<CreditCardEditViewControllerDataSource>
     dataSource;
 
-// The billing address GUID of the card being editted, if any.
-@property(nonatomic, copy) NSString* billingAddressGUID;
-
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithStyle:(CollectionViewControllerStyle)style