[Payment Request] Refactors edit view controller

ios/chrome/browser/ui/payments/address_edit_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/address_edit_coordinator.h"
 
 #include "base/logging.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"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/browser/test_region_data_loader.h"
 #include "components/prefs/pref_service.h"
 #include "ios/chrome/browser/payments/payment_request_test_util.h"
 #include "ios/chrome/browser/payments/test_payment_request.h"
-#import "ios/chrome/browser/ui/payments/address_edit_view_controller.h"
+#import "ios/chrome/browser/ui/payments/payment_request_edit_view_controller.h"
 #import "ios/chrome/browser/ui/payments/payment_request_editor_field.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
@@ skipping 141 matching lines @@
       .Times(1);
   // Expect an autofill profile to be added to the PersonalDataManager.
   EXPECT_CALL(personal_data_manager_,
               AddProfile(ProfileMatches("John Doe", "CA" /* Canada */, "Quebec",
                                         "16502111111")))
       .Times(1);
   // No autofill profile should get updated in the PersonalDataManager.
   EXPECT_CALL(personal_data_manager_, UpdateProfile(_)).Times(0);
 
   // Call the controller delegate method.
-  AddressEditViewController* view_controller =
-      base::mac::ObjCCastStrict<AddressEditViewController>(
+  PaymentRequestEditViewController* view_controller =
+      base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
           navigation_controller.visibleViewController);
-  [coordinator addressEditViewController:view_controller
-                  didFinishEditingFields:GetEditorFields()];
+  [coordinator paymentRequestEditViewController:view_controller
+                         didFinishEditingFields:GetEditorFields()];
 
   EXPECT_OCMOCK_VERIFY(delegate);
 }
 
 // Tests that calling the view controller delegate method which signals that the
 // user has finished editing an address, causes the the corresponding
 // coordinator delegate method to get called. The address should not get
 // re-added to the PaymentRequest instance or the PersonalDataManager. However,
 // it is expected to get updated in the PersonalDataManager.
 TEST_F(PaymentRequestAddressEditCoordinatorTest, DidFinishEditing) {
@@ skipping 30 matching lines @@
   EXPECT_CALL(*payment_request_, AddAutofillProfile(_)).Times(0);
   // No autofill profile should get added to the PersonalDataManager.
   EXPECT_CALL(personal_data_manager_, AddProfile(_)).Times(0);
   // Expect an autofill profile to be updated in the PersonalDataManager.
   EXPECT_CALL(personal_data_manager_,
               UpdateProfile(ProfileMatches("John Doe", "CA" /* Canada */,
                                            "Quebec", "16502111111")))
       .Times(1);
 
   // Call the controller delegate method.
-  AddressEditViewController* view_controller =
-      base::mac::ObjCCastStrict<AddressEditViewController>(
+  PaymentRequestEditViewController* view_controller =
+      base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
           navigation_controller.visibleViewController);
-  [coordinator addressEditViewController:view_controller
-                  didFinishEditingFields:GetEditorFields()];
+  [coordinator paymentRequestEditViewController:view_controller
+                         didFinishEditingFields:GetEditorFields()];
 
   EXPECT_OCMOCK_VERIFY(delegate);
 }
 
 // Tests that calling the view controller delegate method which signals that the
 // user has chosen to cancel creating/editing an address, causes the
 // corresponding coordinator delegate method to get called.
 TEST_F(PaymentRequestAddressEditCoordinatorTest, DidCancel) {
   UIViewController* base_view_controller = [[UIViewController alloc] init];
   UINavigationController* navigation_controller =
@@ skipping 11 matching lines @@
   [coordinator setDelegate:delegate];
 
   EXPECT_EQ(1u, navigation_controller.viewControllers.count);
 
   [coordinator start];
   // Short delay to allow animation to complete.
   base::test::ios::SpinRunLoopWithMaxDelay(base::TimeDelta::FromSecondsD(1.0));
   EXPECT_EQ(2u, navigation_controller.viewControllers.count);
 
   // Call the controller delegate method.
-  AddressEditViewController* view_controller =
-      base::mac::ObjCCastStrict<AddressEditViewController>(
+  PaymentRequestEditViewController* view_controller =
+      base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
           navigation_controller.visibleViewController);
-  [coordinator addressEditViewControllerDidCancel:view_controller];
+  [coordinator paymentRequestEditViewControllerDidCancel:view_controller];
 
   EXPECT_OCMOCK_VERIFY(delegate);
 }