[Payments] Fix bug in shipping option selection.

chrome/browser/ui/views/payments/payment_request_browsertest_base.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 "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 93 matching lines @@
 void PaymentRequestBrowserTestBase::OnOrderSummaryOpened() {
   if (event_observer_)
     event_observer_->Observe(DialogEvent::ORDER_SUMMARY_OPENED);
 }
 
 void PaymentRequestBrowserTestBase::OnPaymentMethodOpened() {
   if (event_observer_)
     event_observer_->Observe(DialogEvent::PAYMENT_METHOD_OPENED);
 }
 
-void PaymentRequestBrowserTestBase::OnShippingSectionOpened() {
+void PaymentRequestBrowserTestBase::OnShippingAddressSectionOpened() {
   if (event_observer_)
-    event_observer_->Observe(DialogEvent::SHIPPING_SECTION_OPENED);
+    event_observer_->Observe(DialogEvent::SHIPPING_ADDRESS_SECTION_OPENED);
+}
+
+void PaymentRequestBrowserTestBase::OnShippingOptionSectionOpened() {
+  if (event_observer_)
+    event_observer_->Observe(DialogEvent::SHIPPING_OPTION_SECTION_OPENED);
 }
 
 void PaymentRequestBrowserTestBase::OnCreditCardEditorOpened() {
   if (event_observer_)
     event_observer_->Observe(DialogEvent::CREDIT_CARD_EDITOR_OPENED);
 }
 
 void PaymentRequestBrowserTestBase::OnShippingAddressEditorOpened() {
   if (event_observer_)
     event_observer_->Observe(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED);
@@ skipping 72 matching lines @@
 
   ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_SUMMARY_SECTION);
 }
 
 void PaymentRequestBrowserTestBase::OpenPaymentMethodScreen() {
   ResetEventObserver(DialogEvent::PAYMENT_METHOD_OPENED);
 
   ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION);
 }
 
-void PaymentRequestBrowserTestBase::OpenShippingSectionScreen() {
-  ResetEventObserver(DialogEvent::SHIPPING_SECTION_OPENED);
+void PaymentRequestBrowserTestBase::OpenShippingAddressSectionScreen() {
+  ResetEventObserver(DialogEvent::SHIPPING_ADDRESS_SECTION_OPENED);
 
-  ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_SHIPPING_SECTION);
+  ClickOnDialogViewAndWait(
+      DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION);
 }
 
+void PaymentRequestBrowserTestBase::OpenShippingOptionSectionScreen() {
+  ResetEventObserver(DialogEvent::SHIPPING_OPTION_SECTION_OPENED);
+
+  ClickOnDialogViewAndWait(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION);
+}
 void PaymentRequestBrowserTestBase::OpenCreditCardEditorScreen() {
   ResetEventObserver(DialogEvent::CREDIT_CARD_EDITOR_OPENED);
 
   ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_CARD_BUTTON);
 }
 
 void PaymentRequestBrowserTestBase::OpenShippingAddressEditorScreen() {
   ResetEventObserver(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED);
 
   ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON);
@@ skipping 289 matching lines @@
     std::list<DialogEvent> event_sequence) {
   event_observer_ =
       base::MakeUnique<DialogEventObserver>(std::move(event_sequence));
 }
 
 void PaymentRequestBrowserTestBase::WaitForObservedEvent() {
   event_observer_->Wait();
 }
 
 }  // namespace payments