[Payments] Fix bug in shipping option selection.

chrome/browser/ui/views/payments/payment_request_browsertest_base.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_BROWSERTEST_BASE_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_BROWSERTEST_BASE_H_
 
 #include <list>
 #include <memory>
 #include <string>
@@ skipping 62 matching lines @@
 
   void SetIncognitoForTesting();
 
   // PaymentRequest::ObserverForTest:
   void OnCanMakePaymentCalled() override;
 
   // PaymentRequestDialogView::ObserverForTest:
   void OnDialogOpened() override;
   void OnOrderSummaryOpened() override;
   void OnPaymentMethodOpened() override;
-  void OnShippingSectionOpened() override;
+  void OnShippingAddressSectionOpened() override;
+  void OnShippingOptionSectionOpened() override;
   void OnCreditCardEditorOpened() override;
   void OnShippingAddressEditorOpened() override;
   void OnBackNavigation() override;
   void OnContactInfoOpened() override;
   void OnEditorViewUpdated() override;
   void OnErrorMessageShown() override;
   void OnSpecDoneUpdating() override;
   void OnCvcPromptShown() override;
 
   // views::WidgetObserver
   // Effective way to be warned of all dialog closures.
   void OnWidgetDestroyed(views::Widget* widget) override;
 
   // Will call JavaScript to invoke the PaymentRequest dialog and verify that
   // it's open.
   void InvokePaymentRequestUI();
 
   // Will expect that all strings in |expected_strings| are present in output.
   void ExpectBodyContains(const std::vector<base::string16>& expected_strings);
 
   // Utility functions that will click on Dialog views and wait for the
   // associated action to happen.
   void OpenOrderSummaryScreen();
   void OpenPaymentMethodScreen();
-  void OpenShippingSectionScreen();
+  void OpenShippingAddressSectionScreen();
+  void OpenShippingOptionSectionScreen();
   void OpenCreditCardEditorScreen();
   void OpenShippingAddressEditorScreen();
   void ClickOnBackArrow();
 
   content::WebContents* GetActiveWebContents();
 
   // Convenience method to get a list of PaymentRequest associated with
   // |web_contents|.
   const std::vector<PaymentRequest*> GetPaymentRequests(
       content::WebContents* web_contents);
@@ skipping 56 matching lines @@
   net::EmbeddedTestServer* https_server() { return https_server_.get(); }
 
   PaymentRequestDialogView* dialog_view() { return delegate_->dialog_view(); }
 
   // Various events that can be waited on by the DialogEventObserver.
   enum DialogEvent : int {
     DIALOG_OPENED,
     DIALOG_CLOSED,
     ORDER_SUMMARY_OPENED,
     PAYMENT_METHOD_OPENED,
-    SHIPPING_SECTION_OPENED,
+    SHIPPING_ADDRESS_SECTION_OPENED,
+    SHIPPING_OPTION_SECTION_OPENED,
     CREDIT_CARD_EDITOR_OPENED,
     SHIPPING_ADDRESS_EDITOR_OPENED,
     BACK_NAVIGATION,
     CONTACT_INFO_OPENED,
     EDITOR_VIEW_UPDATED,
     CAN_MAKE_PAYMENT_CALLED,
     ERROR_MESSAGE_SHOWN,
     SPEC_DONE_UPDATING,
     CVC_PROMPT_SHOWN,
   };
@@ skipping 43 matching lines @@
   // Weak, owned by the PaymentRequest object.
   TestChromePaymentRequestDelegate* delegate_;
   bool incognito_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestBrowserTestBase);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_BROWSERTEST_BASE_H_