[Payments] Make AutofillPaymentInstrumentTest use test objects

components/payments/content/payment_request_state_unittest.cc

 // 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.
 
 #include "components/payments/content/payment_request_state.h"
 
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 37 matching lines @@
   void OnShippingAddressSelected(mojom::PaymentAddressPtr address) override {
     selected_shipping_address_ = std::move(address);
   }
 
   void RecreateStateWithOptionsAndDetails(
       mojom::PaymentOptionsPtr options,
       mojom::PaymentDetailsPtr details,
       std::vector<mojom::PaymentMethodDataPtr> method_data) {
     // The spec will be based on the |options| and |details| passed in.
     spec_ = base::MakeUnique<PaymentRequestSpec>(
-        std::move(options), std::move(details), std::move(method_data), nullptr,
-        "en-US");
+        std::move(options), std::move(details), std::move(method_data),
+        /*observer=*/nullptr, "en-US");
     state_ = base::MakeUnique<PaymentRequestState>(
         spec_.get(), this, "en-US", &test_personal_data_manager_,
         &test_payment_request_delegate_);
     state_->AddObserver(this);
   }
 
   // Convenience method to create a PaymentRequestState with default details
   // (one shipping option) and method data (only supports visa).
   void RecreateStateWithOptions(mojom::PaymentOptionsPtr options) {
     RecreateStateWithOptionsAndDetails(
@@ skipping 198 matching lines @@
   EXPECT_TRUE(state()->is_ready_to_pay());
 }
 
 TEST_F(PaymentRequestStateTest, SelectedShippingAddressMessage_Normalized) {
   mojom::PaymentOptionsPtr options = mojom::PaymentOptions::New();
   options->request_shipping = true;
   RecreateStateWithOptions(std::move(options));
 
   // Make the normalization not be instantaneous.
   test_payment_request_delegate()
-      ->GetTestAddressNormalizer()
+      ->test_address_normalizer()
       ->DelayNormalization();
 
   EXPECT_EQ(0, num_on_selected_information_changed_called());
 
   // Select an address, nothing should happen until the normalization is
   // completed and the merchant has validated the address.
   state()->SetSelectedShippingProfile(test_address());
   EXPECT_EQ(1, num_on_selected_information_changed_called());
   EXPECT_FALSE(state()->is_ready_to_pay());
 
   // Complete the normalization.
   test_payment_request_delegate()
-      ->GetTestAddressNormalizer()
+      ->test_address_normalizer()
       ->CompleteAddressNormalization();
   EXPECT_EQ(1, num_on_selected_information_changed_called());
   EXPECT_FALSE(state()->is_ready_to_pay());
 
   // Simulate that the merchant has validated the shipping address change.
   spec()->UpdateWith(CreateDefaultDetails());
   EXPECT_EQ(2, num_on_selected_information_changed_called());
   EXPECT_TRUE(state()->is_ready_to_pay());
 
   // Check that all the expected values were set for the shipping address.
   EXPECT_EQ("US", selected_shipping_address()->country);
   EXPECT_EQ("666 Erebus St.", selected_shipping_address()->address_line[0]);
   EXPECT_EQ("Apt 8", selected_shipping_address()->address_line[1]);
   EXPECT_EQ("CA", selected_shipping_address()->region);
   EXPECT_EQ("Elysium", selected_shipping_address()->city);
   EXPECT_EQ("", selected_shipping_address()->dependent_locality);
   EXPECT_EQ("91111", selected_shipping_address()->postal_code);
   EXPECT_EQ("", selected_shipping_address()->sorting_code);
   EXPECT_EQ("", selected_shipping_address()->language_code);
   EXPECT_EQ("Underworld", selected_shipping_address()->organization);
   EXPECT_EQ("John H. Doe", selected_shipping_address()->recipient);
   EXPECT_EQ("16502111111", selected_shipping_address()->phone);
 }
 
 }  // namespace payments