[Payments] Fix bug in shipping option selection.

chrome/browser/ui/views/payments/order_summary_view_controller_browsertest.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 <list>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 33 matching lines @@
   // and 'Subtotal', respectively).
   EXPECT_EQ(base::ASCIIToUTF16("USD $5.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL));
   EXPECT_EQ(base::ASCIIToUTF16("$0.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_LINE_ITEM_1));
   EXPECT_EQ(base::ASCIIToUTF16("$5.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_LINE_ITEM_2));
 
   // Go to the shipping address screen and select the first address (MI state).
   ClickOnBackArrow();
-  OpenShippingSectionScreen();
+  OpenShippingAddressSectionScreen();
   ResetEventObserverForSequence(std::list<DialogEvent>{
       DialogEvent::BACK_NAVIGATION, DialogEvent::SPEC_DONE_UPDATING});
   ClickOnChildInListViewAndWait(
       /* child_index=*/0, /*total_num_children=*/2,
       DialogViewID::SHIPPING_ADDRESS_SHEET_LIST_VIEW);
 
   // Michigan address is selected and has standard shipping.
-  std::vector<base::string16> shipping_address_labels =
-      GetThreeLineLabelValues(DialogViewID::PAYMENT_SHEET_SHIPPING_SECTION);
+  std::vector<base::string16> shipping_address_labels = GetThreeLineLabelValues(
+      DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION);
   EXPECT_EQ(base::ASCIIToUTF16("Jane A. Smith"), shipping_address_labels[0]);
   EXPECT_EQ(
       base::ASCIIToUTF16("ACME, 123 Main Street, Unit 1, Greensdale, MI 48838"),
       shipping_address_labels[1]);
   EXPECT_EQ(base::ASCIIToUTF16("13105557889"), shipping_address_labels[2]);
   std::vector<base::string16> shipping_option_labels =
       GetShippingOptionLabelValues(
           DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION);
   EXPECT_EQ(base::ASCIIToUTF16("Standard shipping in US"),
             shipping_option_labels[0]);
   EXPECT_EQ(base::ASCIIToUTF16("$5.00"), shipping_option_labels[1]);
 
   // Go back to Order Summary screen to see updated totals.
   OpenOrderSummaryScreen();
 
   // Verify the expected amounts are shown ('Total', 'Standard shipping in US'
   // and 'Subtotal', respectively).
   EXPECT_EQ(base::ASCIIToUTF16("USD $10.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL));
   EXPECT_EQ(base::ASCIIToUTF16("$5.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_LINE_ITEM_1));
   EXPECT_EQ(base::ASCIIToUTF16("$5.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_LINE_ITEM_2));
 
   // Go to the shipping address screen and select the second address (CA state).
   ClickOnBackArrow();
-  OpenShippingSectionScreen();
+  OpenShippingAddressSectionScreen();
   ResetEventObserverForSequence(std::list<DialogEvent>{
       DialogEvent::BACK_NAVIGATION, DialogEvent::SPEC_DONE_UPDATING});
   ClickOnChildInListViewAndWait(
       /* child_index=*/1, /*total_num_children=*/2,
       DialogViewID::SHIPPING_ADDRESS_SHEET_LIST_VIEW);
 
   // California address is selected and has free shipping.
-  shipping_address_labels =
-      GetThreeLineLabelValues(DialogViewID::PAYMENT_SHEET_SHIPPING_SECTION);
+  shipping_address_labels = GetThreeLineLabelValues(
+      DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION);
   EXPECT_EQ(base::ASCIIToUTF16("John H. Doe"), shipping_address_labels[0]);
   EXPECT_EQ(base::ASCIIToUTF16(
                 "Underworld, 666 Erebus St., Apt 8, Elysium, CA 91111"),
             shipping_address_labels[1]);
   EXPECT_EQ(base::ASCIIToUTF16("16502111111"), shipping_address_labels[2]);
   shipping_option_labels = GetShippingOptionLabelValues(
       DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION);
   EXPECT_EQ(base::ASCIIToUTF16("Free shipping in California"),
             shipping_option_labels[0]);
   EXPECT_EQ(base::ASCIIToUTF16("$0.00"), shipping_option_labels[1]);
 
   // Go back to Order Summary screen to see updated totals.
   OpenOrderSummaryScreen();
 
   // Verify the expected amounts are shown ('Total',
   // 'Free shipping in California' and 'Subtotal', respectively).
   EXPECT_EQ(base::ASCIIToUTF16("USD $5.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL));
   EXPECT_EQ(base::ASCIIToUTF16("$0.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_LINE_ITEM_1));
   EXPECT_EQ(base::ASCIIToUTF16("$5.00"),
             GetStyledLabelText(DialogViewID::ORDER_SUMMARY_LINE_ITEM_2));
 }
 
 }  // namespace payments