Avoid confusion with PaymentRequestUnitTestBase.

PaymentRequestUnitTestBase is not a test class, yet it looks like one
since it has SetUp() and TearDown(). To make it more obvious that it is
not a test class:

1) Prefix SetUp() and TearDown() with "Do".
2) Label the SetUp() and TearDown() overrides in classes that inherit
   from PaymentRequestUnitTestBase. Typically the methods override
   PlatformTest.

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I5c43bd5bf5adee7acd93e40f9a403a90a95180ae
Reviewed-on: https://chromium-review.googlesource.com/c/1281238
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599779}

ios/chrome/browser/payments/payment_request_unittest_base.h

@@ -35,8 +35,8 @@ class PaymentRequestUnitTestBase {
   PaymentRequestUnitTestBase();
   ~PaymentRequestUnitTestBase();
 
-  void SetUp();
-  void TearDown();
+  void DoSetUp();
+  void DoTearDown();
 
   // Should be called after data is added to the database via AddAutofillProfile
   // and/or AddCreditCard.

ios/chrome/browser/payments/payment_request_unittest_base.mm

@@ -20,7 +20,7 @@ PaymentRequestUnitTestBase::PaymentRequestUnitTestBase()
 
 PaymentRequestUnitTestBase::~PaymentRequestUnitTestBase() {}
 
-void PaymentRequestUnitTestBase::SetUp() {
+void PaymentRequestUnitTestBase::DoSetUp() {
   TestChromeBrowserState::Builder test_cbs_builder;
   test_cbs_builder.AddTestingFactory(
       ios::SigninManagerFactory::GetInstance(),
@@ -30,7 +30,7 @@ void PaymentRequestUnitTestBase::SetUp() {
   personal_data_manager_.SetPrefService(pref_service_.get());
 }
 
-void PaymentRequestUnitTestBase::TearDown() {
+void PaymentRequestUnitTestBase::DoTearDown() {
   personal_data_manager_.SetPrefService(nullptr);
 }
 

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

@@ -96,8 +96,9 @@ class PaymentRequestAddressEditCoordinatorTest
  protected:
   PaymentRequestAddressEditCoordinatorTest() {}
 
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     autofill::CountryNames::SetLocaleString("en-US");
     personal_data_manager_.SetPrefService(pref_service());
@@ -110,10 +111,11 @@ class PaymentRequestAddressEditCoordinatorTest
     payment_request_->SetRegionDataLoader(&test_region_data_loader_);
   }
 
+  // PlatformTest:
   void TearDown() override {
     personal_data_manager_.SetPrefService(nullptr);
 
-    PaymentRequestUnitTestBase::TearDown();
+    DoTearDown();
   }
 
   autofill::TestPersonalDataManager personal_data_manager_;

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

@@ -28,8 +28,9 @@
 class PaymentRequestAddressEditMediatorTest : public PaymentRequestUnitTestBase,
                                               public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     autofill::CountryNames::SetLocaleString("en-US");
 
@@ -39,7 +40,8 @@ class PaymentRequestAddressEditMediatorTest : public PaymentRequestUnitTestBase,
     payment_request()->SetRegionDataLoader(&test_region_data_loader_);
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
   autofill::TestRegionDataLoader test_region_data_loader_;
 };

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

@@ -26,8 +26,9 @@ class PaymentRequestBillingAddressSelectionCoordinatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     // Add testing profiles to the database. Make the less frequently used one
     // incomplete.
@@ -56,7 +57,8 @@ class PaymentRequestBillingAddressSelectionCoordinatorTest
     [coordinator_ setPaymentRequest:payment_request()];
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
   UINavigationController* GetNavigationController() {
     return navigation_controller_;

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

@@ -27,11 +27,11 @@ class PaymentRequestBillingAddressSelectionMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
-  void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
-  }
+  // PlatformTest:
+  void SetUp() override { DoSetUp(); }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that the expected selectable items are created and that the index of

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

@@ -86,8 +86,9 @@ class PaymentRequestContactInfoEditCoordinatorTest
  protected:
   PaymentRequestContactInfoEditCoordinatorTest() {}
 
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     personal_data_manager_.SetPrefService(pref_service());
 
@@ -99,10 +100,11 @@ class PaymentRequestContactInfoEditCoordinatorTest
     payment_request_->SetRegionDataLoader(&test_region_data_loader_);
   }
 
+  // PlatformTest:
   void TearDown() override {
     personal_data_manager_.SetPrefService(nullptr);
 
-    PaymentRequestUnitTestBase::TearDown();
+    DoTearDown();
   }
 
   autofill::TestPersonalDataManager personal_data_manager_;

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

@@ -27,13 +27,15 @@ class PaymentRequestContactInfoEditMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that the expected editor fields are created when creating a profile.

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

@@ -28,8 +28,9 @@ class PaymentRequestContactInfoSelectionCoordinatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     // One profile is incomplete.
     AddAutofillProfile(autofill::test::GetFullProfile());
@@ -38,7 +39,8 @@ class PaymentRequestContactInfoSelectionCoordinatorTest
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that invoking start and stop on the coordinator presents and dismisses

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

@@ -29,8 +29,9 @@ class PaymentRequestContactInfoSelectionMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     AddAutofillProfile(autofill::test::GetFullProfile());
     AddAutofillProfile(autofill::test::GetFullProfile2());
@@ -53,7 +54,8 @@ class PaymentRequestContactInfoSelectionMediatorTest
         initWithPaymentRequest:payment_request()];
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
   ContactInfoSelectionMediator* mediator() const { return mediator_; }
 

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

@@ -119,15 +119,17 @@ class PaymentRequestCreditCardEditCoordinatorTest
     personal_data_manager_.SetAutofillWalletImportEnabled(true);
   }
 
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     payment_request_ = std::make_unique<MockPaymentRequest>(
         payment_request_test_util::CreateTestWebPaymentRequest(),
         browser_state(), web_state(), &personal_data_manager_);
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
   autofill::TestPersonalDataManager personal_data_manager_;
   std::unique_ptr<MockPaymentRequest> payment_request_;

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

@@ -32,14 +32,16 @@ class PaymentRequestCreditCardEditMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     AddAutofillProfile(autofill::test::GetFullProfile());
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that the expected editor fields are created when creating a card.

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

@@ -59,8 +59,9 @@ class PaymentRequestFullCardRequesterTest : public PaymentRequestUnitTestBase,
  protected:
   PaymentRequestFullCardRequesterTest() {}
 
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     AddCreditCard(autofill::test::GetCreditCard());  // Visa.
 
@@ -84,10 +85,11 @@ class PaymentRequestFullCardRequesterTest : public PaymentRequestUnitTestBase,
                                          downloadEnabled:NO];
   }
 
+  // PlatformTest:
   void TearDown() override {
     [autofill_controller_ detachFromWebState];
 
-    PaymentRequestUnitTestBase::TearDown();
+    DoTearDown();
   }
 
   // Manages autofill for a single page.

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

@@ -22,13 +22,15 @@ class PaymentRequestPaymentItemsDisplayCoordinatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that invoking start and stop on the coordinator presents and dismisses

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

@@ -22,9 +22,11 @@ class PaymentRequestPaymentItemsDisplayMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
-  void SetUp() override { PaymentRequestUnitTestBase::SetUp(); }
+  // PlatformTest:
+  void SetUp() override { DoSetUp(); }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that the expected total item is created.

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

@@ -44,12 +44,14 @@ class PaymentRequestPaymentItemsDisplayViewControllerTest
     : public CollectionViewControllerTest,
       public PaymentRequestUnitTestBase {
  protected:
+  // CollectionViewControllerTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
     CollectionViewControllerTest::SetUp();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // CollectionViewControllerTest:
+  void TearDown() override { DoTearDown(); }
 
   CollectionViewController* InstantiateController() override {
     mediator_ = [[TestPaymentItemsDisplayMediator alloc] init];

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

@@ -26,8 +26,9 @@ class PaymentRequestPaymentMethodSelectionCoordinatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     // Add testing credit cards to the database. Make the less frequently used
     // one incomplete.
@@ -44,7 +45,8 @@ class PaymentRequestPaymentMethodSelectionCoordinatorTest
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that invoking start and stop on the coordinator presents and dismisses

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

@@ -27,9 +27,11 @@ class PaymentRequestPaymentMethodSelectionMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
-  void SetUp() override { PaymentRequestUnitTestBase::SetUp(); }
+  // PlatformTest:
+  void SetUp() override { DoSetUp(); }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that the expected selectable items are created and that the index of

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

@@ -78,8 +78,9 @@ typedef void (^mock_coordinator_select_shipping_option)(
 class PaymentRequestCoordinatorTest : public PaymentRequestUnitTestBase,
                                       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     autofill::AutofillProfile profile = autofill::test::GetFullProfile();
     autofill::CreditCard card = autofill::test::GetCreditCard();  // Visa.
@@ -90,7 +91,8 @@ class PaymentRequestCoordinatorTest : public PaymentRequestUnitTestBase,
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that invoking start and stop on the coordinator presents and

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

@@ -45,8 +45,9 @@ using ::payment_request_util::GetShippingAddressLabelFromAutofillProfile;
 class PaymentRequestMediatorTest : public PaymentRequestUnitTestBase,
                                    public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     autofill::AutofillProfile profile = autofill::test::GetFullProfile();
     autofill::CreditCard card = autofill::test::GetCreditCard();  // Visa.
@@ -60,7 +61,8 @@ class PaymentRequestMediatorTest : public PaymentRequestUnitTestBase,
         initWithPaymentRequest:payment_request()];
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
   PaymentRequestMediator* mediator() { return mediator_; }
 

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

@@ -123,14 +123,16 @@
 class PaymentRequestViewControllerTest : public CollectionViewControllerTest,
                                          public PaymentRequestUnitTestBase {
  protected:
+  // CollectionViewControllerTest:
   void SetUp() override {
     CollectionViewControllerTest::SetUp();
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     mediator_ = [[TestPaymentRequestMediator alloc] init];
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // CollectionViewControllerTest:
+  void TearDown() override { DoTearDown(); }
 
   CollectionViewController* InstantiateController() override {
     PaymentRequestViewController* viewController =

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

@@ -26,8 +26,9 @@ class PaymentRequestShippingAddressSelectionCoordinatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     // Add testing profiles to the database. Make the less frequently used one
     // incomplete.
@@ -47,7 +48,8 @@ class PaymentRequestShippingAddressSelectionCoordinatorTest
     payment_request()->SetRegionDataLoader(&test_region_data_loader_);
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
  private:
   autofill::TestRegionDataLoader test_region_data_loader_;

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

@@ -27,9 +27,11 @@ class PaymentRequestShippingAddressSelectionMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
-  void SetUp() override { PaymentRequestUnitTestBase::SetUp(); }
+  // PlatformTest:
+  void SetUp() override { DoSetUp(); }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that the expected selectable items are created and that the index of

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

@@ -25,13 +25,15 @@ class PaymentRequestShippingOptionSelectionCoordinatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
+  // PlatformTest:
   void SetUp() override {
-    PaymentRequestUnitTestBase::SetUp();
+    DoSetUp();
 
     CreateTestPaymentRequest();
   }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 };
 
 // Tests that invoking start and stop on the coordinator presents and dismisses

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

@@ -22,9 +22,11 @@ class PaymentRequestShippingOptionSelectionMediatorTest
     : public PaymentRequestUnitTestBase,
       public PlatformTest {
  protected:
-  void SetUp() override { PaymentRequestUnitTestBase::SetUp(); }
+  // PlatformTest:
+  void SetUp() override { DoSetUp(); }
 
-  void TearDown() override { PaymentRequestUnitTestBase::TearDown(); }
+  // PlatformTest:
+  void TearDown() override { DoTearDown(); }
 
   // Returns a PaymentDetails instance with two unselected shipping options.
   payments::PaymentDetails CreateDetailsWithUnselectedShippingOptions() {