[Payment Request] Refactors the remaining selector view controllers

ios/chrome/browser/payments/BUILD.gn

 # Copyright 2016 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/web/js_compile.gni")
 
 source_set("payments") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "credit_card_edit_coordinator.h",
     "credit_card_edit_coordinator.mm",
     "credit_card_edit_mediator.h",
     "credit_card_edit_mediator.mm",
     "js_payment_request_manager.h",
     "js_payment_request_manager.mm",
     "payment_items_display_coordinator.h",
     "payment_items_display_coordinator.mm",
     "payment_items_display_view_controller.h",
     "payment_items_display_view_controller.mm",
     "payment_items_display_view_controller_actions.h",
     "payment_method_selection_coordinator.h",
     "payment_method_selection_coordinator.mm",
-    "payment_method_selection_view_controller.h",
-    "payment_method_selection_view_controller.mm",
-    "payment_method_selection_view_controller_actions.h",
+    "payment_method_selection_mediator.h",
+    "payment_method_selection_mediator.mm",
     "payment_request.h",
     "payment_request.mm",
     "payment_request_coordinator.h",
     "payment_request_coordinator.mm",
     "payment_request_error_coordinator.h",
     "payment_request_error_coordinator.mm",
     "payment_request_error_view_controller.h",
     "payment_request_error_view_controller.mm",
     "payment_request_error_view_controller_actions.h",
     "payment_request_manager.h",
     "payment_request_manager.mm",
     "payment_request_util.h",
     "payment_request_util.mm",
     "payment_request_view_controller.h",
     "payment_request_view_controller.mm",
     "payment_request_view_controller_actions.h",
     "shipping_address_selection_coordinator.h",
     "shipping_address_selection_coordinator.mm",
     "shipping_address_selection_mediator.h",
     "shipping_address_selection_mediator.mm",
     "shipping_option_selection_coordinator.h",
     "shipping_option_selection_coordinator.mm",
-    "shipping_option_selection_view_controller.h",
-    "shipping_option_selection_view_controller.mm",
-    "shipping_option_selection_view_controller_actions.h",
+    "shipping_option_selection_mediator.h",
+    "shipping_option_selection_mediator.mm",
   ]
   deps = [
     ":payments_ui",
     "//base",
     "//components/autofill/core/browser",
     "//components/autofill/ios/browser",
     "//components/payments/core",
     "//components/signin/core/browser",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ skipping 60 matching lines @@
 
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
     "credit_card_edit_coordinator_unittest.mm",
     "credit_card_edit_view_controller_unittest.mm",
     "payment_items_display_coordinator_unittest.mm",
     "payment_items_display_view_controller_unittest.mm",
     "payment_method_selection_coordinator_unittest.mm",
-    "payment_method_selection_view_controller_unittest.mm",
     "payment_request_coordinator_unittest.mm",
     "payment_request_error_coordinator_unittest.mm",
     "payment_request_error_view_controller_unittest.mm",
     "payment_request_selector_view_controller_unittest.mm",
     "payment_request_test_util.h",
     "payment_request_test_util.mm",
     "payment_request_unittest.mm",
     "payment_request_view_controller_unittest.mm",
     "shipping_address_selection_coordinator_unittest.mm",
     "shipping_option_selection_coordinator_unittest.mm",
-    "shipping_option_selection_view_controller_unittest.mm",
   ]
   deps = [
     ":payments",
     ":payments_ui",
     "//base",
     "//base/test:test_support",
     "//components/autofill/core/browser",
     "//components/autofill/core/browser:test_support",
     "//components/payments/core",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/payments/cells",
     "//ios/chrome/browser/ui/autofill:autofill_ui",
     "//ios/chrome/browser/ui/autofill/cells",
     "//ios/chrome/browser/ui/collection_view:test_support",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/collection_view/cells:test_support",
     "//ios/chrome/test:test_support",
     "//ios/testing:ocmock_support",
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ios/web:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",
   ]
 }