| Index: chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
|
| diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
|
| index 77386fec09803595fd98dfa2a1bbda99a0853788..90a3468d3d2d9c279af370f514cc3dd3fdbf0fb9 100644
|
| --- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
|
| +++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc
|
| @@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest, SyncData) {
|
| base::RunLoop data_loop;
|
| EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
|
| .WillOnce(QuitMessageLoop(&data_loop));
|
| - ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
|
| + ClickOnDialogViewAndWait(DialogViewID::SAVE_ADDRESS_BUTTON);
|
| data_loop.Run();
|
|
|
| ASSERT_EQ(1UL, personal_data_manager->GetProfiles().size());
|
| @@ -249,7 +249,7 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest, AsyncData) {
|
| base::RunLoop data_loop;
|
| EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
|
| .WillOnce(QuitMessageLoop(&data_loop));
|
| - ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
|
| + ClickOnDialogViewAndWait(DialogViewID::SAVE_ADDRESS_BUTTON);
|
| data_loop.Run();
|
|
|
| ASSERT_EQ(1UL, personal_data_manager->GetProfiles().size());
|
| @@ -389,7 +389,7 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
|
| base::RunLoop data_loop;
|
| EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
|
| .WillOnce(QuitMessageLoop(&data_loop));
|
| - ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
|
| + ClickOnDialogViewAndWait(DialogViewID::SAVE_ADDRESS_BUTTON);
|
| data_loop.Run();
|
|
|
| ASSERT_EQ(1UL, personal_data_manager->GetProfiles().size());
|
| @@ -428,7 +428,7 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
|
| base::RunLoop data_loop;
|
| EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
|
| .WillOnce(QuitMessageLoop(&data_loop));
|
| - ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
|
| + ClickOnDialogViewAndWait(DialogViewID::SAVE_ADDRESS_BUTTON);
|
| data_loop.Run();
|
|
|
| ASSERT_EQ(1UL, personal_data_manager->GetProfiles().size());
|
| @@ -446,7 +446,7 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
|
| autofill::AutofillProfile profile;
|
| profile.SetInfo(autofill::AutofillType(autofill::NAME_FULL),
|
| base::ASCIIToUTF16(kNameFull), "fr_CA");
|
| - PaymentRequestBrowserTestBase::AddAutofillProfile(profile);
|
| + AddAutofillProfile(profile);
|
|
|
| InvokePaymentRequestUI();
|
|
|
| @@ -479,7 +479,7 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
|
| base::RunLoop data_loop;
|
| EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
|
| .WillOnce(QuitMessageLoop(&data_loop));
|
| - ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
|
| + ClickOnDialogViewAndWait(DialogViewID::SAVE_ADDRESS_BUTTON);
|
| data_loop.Run();
|
|
|
| ExpectExistingRequiredFields(/*unset_types=*/nullptr);
|
|
|