[Payment Request] Refactors PaymentRequestCoordinator.

ios/chrome/browser/ui/payments/payment_request_coordinator_unittest.mm

 // Copyright 2017 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.
 
 #import "ios/chrome/browser/ui/payments/payment_request_coordinator.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/ios/wait_util.h"
@@ skipping 19 matching lines @@
 #error "This file requires ARC support."
 #endif
 
 @interface PaymentRequestCoordinatorDelegateMock<
     PaymentRequestCoordinatorDelegate>:OCMockComplexTypeHelper
 @end
 
 @implementation PaymentRequestCoordinatorDelegateMock
 
 typedef void (^mock_coordinator_cancel)(PaymentRequestCoordinator*);
-typedef void (^mock_coordinator_confirm)(PaymentRequestCoordinator*,
-                                         web::PaymentResponse);
+typedef void (^mock_coordinator_complete)(PaymentRequestCoordinator*,
+                                          PaymentRequest*,
+                                          const autofill::CreditCard&,
+                                          const base::string16&);
 typedef void (^mock_coordinator_select_shipping_address)(
     PaymentRequestCoordinator*,
     payments::PaymentAddress);
 typedef void (^mock_coordinator_select_shipping_option)(
     PaymentRequestCoordinator*,
     web::PaymentShippingOption);
 
 - (void)paymentRequestCoordinatorDidCancel:
     (PaymentRequestCoordinator*)coordinator {
   return static_cast<mock_coordinator_cancel>([self blockForSelector:_cmd])(
       coordinator);
 }
 
 - (void)paymentRequestCoordinator:(PaymentRequestCoordinator*)coordinator
-    didConfirmWithPaymentResponse:(web::PaymentResponse)paymentResponse {
-  return static_cast<mock_coordinator_confirm>([self blockForSelector:_cmd])(
-      coordinator, paymentResponse);
+        didCompletePaymentRequest:(PaymentRequest*)paymentRequest
+                             card:(const autofill::CreditCard&)card
+                 verificationCode:(const base::string16&)verificationCode {
+  return static_cast<mock_coordinator_complete>([self blockForSelector:_cmd])(
+      coordinator, paymentRequest, card, verificationCode);
 }
 
 - (void)paymentRequestCoordinator:(PaymentRequestCoordinator*)coordinator
          didSelectShippingAddress:(payments::PaymentAddress)shippingAddress {
   return static_cast<mock_coordinator_select_shipping_address>(
       [self blockForSelector:_cmd])(coordinator, shippingAddress);
 }
 
 - (void)paymentRequestCoordinator:(PaymentRequestCoordinator*)coordinator
           didSelectShippingOption:(web::PaymentShippingOption)shippingOption {
@@ skipping 71 matching lines @@
   [scoped_key_window_.Get() setRootViewController:base_view_controller];
 
   PaymentRequestCoordinator* coordinator = [[PaymentRequestCoordinator alloc]
       initWithBaseViewController:base_view_controller];
   [coordinator setPaymentRequest:payment_request_.get()];
 
   id delegate = [OCMockObject
       mockForProtocol:@protocol(PaymentMethodSelectionCoordinatorDelegate)];
   id delegate_mock([[PaymentRequestCoordinatorDelegateMock alloc]
       initWithRepresentedObject:delegate]);
-  SEL selector =
-      @selector(paymentRequestCoordinator:didConfirmWithPaymentResponse:);
+  SEL selector = @selector(paymentRequestCoordinator:didCompletePaymentRequest

[marq (ping after 24h), 2017/05/09 15:40:12]

Nit -- this formatting confuses me (although I'm sure clang-format likes it just
fine). Can you fit the whole selector name on one line if you break after the
"(":

SEL selector = @selector(
    paymentRequestCoordinator:didCompletePaymentRequest:card:verificationCode:);

[macourteau, 2017/05/09 15:48:36]

That doesn't fit. Changed to something clearer.

+                                                    :card:verificationCode:);
   [delegate_mock onSelector:selector
        callBlockExpectation:^(PaymentRequestCoordinator* callerCoordinator,
-                              web::PaymentResponse paymentResponse) {
-         EXPECT_EQ(base::ASCIIToUTF16("4111111111111111"),
-                   paymentResponse.details.card_number);
-         EXPECT_EQ(base::ASCIIToUTF16("Test User"),
-                   paymentResponse.details.cardholder_name);
-         EXPECT_EQ(base::ASCIIToUTF16("11"),
-                   paymentResponse.details.expiry_month);
-         EXPECT_EQ(base::ASCIIToUTF16("2022"),
-                   paymentResponse.details.expiry_year);
-         EXPECT_EQ(base::ASCIIToUTF16("123"),
-                   paymentResponse.details.card_security_code);
+                              PaymentRequest* paymentRequest,
+                              const autofill::CreditCard& card,
+                              const base::string16& verificationCode) {
+         EXPECT_EQ(credit_card_, card);
+         EXPECT_EQ(base::ASCIIToUTF16("123"), verificationCode);
          EXPECT_EQ(coordinator, callerCoordinator);
        }];
   [coordinator setDelegate:delegate_mock];
 
   // Call the card unmasking delegate method.
   [coordinator fullCardRequestDidSucceedWithCard:credit_card_
-                                             CVC:base::ASCIIToUTF16("123")];
+                                verificationCode:base::ASCIIToUTF16("123")];
 }
 
 // Tests that calling the ShippingAddressSelectionCoordinator delegate method
 // which notifies the coordinator about selection of a shipping address invokes
 // the corresponding coordinator delegate method with the expected information.
 TEST_F(PaymentRequestCoordinatorTest, DidSelectShippingAddress) {
   UIViewController* base_view_controller = [[UIViewController alloc] init];
   ScopedKeyWindow scoped_key_window_;
   [scoped_key_window_.Get() setRootViewController:base_view_controller];
 
@@ skipping 96 matching lines @@
   [coordinator setDelegate:delegate_mock];
   [coordinator setBrowserState:browser_state_.get()];
 
   [coordinator start];
   // Short delay to allow animation to complete.
   base::test::ios::SpinRunLoopWithMaxDelay(base::TimeDelta::FromSecondsD(1));
 
   // Call the controller delegate method.
   [coordinator paymentRequestViewControllerDidCancel:nil];
 }