[Payments] Change how the dialog gets destroyed.

chrome/browser/ui/views/payments/payment_request_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 <vector>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
@@ skipping 63 matching lines @@
 IN_PROC_BROWSER_TEST_F(PaymentRequestNoShippingTest, OpenAndReload) {
   InvokePaymentRequestUI();
 
   ResetEventObserver(DialogEvent::DIALOG_CLOSED);
 
   chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
 
   WaitForObservedEvent();
 }
 
+IN_PROC_BROWSER_TEST_F(PaymentRequestNoShippingTest, OpenAndClickCancel) {
+  InvokePaymentRequestUI();
+
+  ResetEventObserver(DialogEvent::DIALOG_CLOSED);
+
+  ClickOnDialogViewAndWait(DialogViewID::CANCEL_BUTTON,
+                           /*wait_for_animation=*/false);
+}
+
+IN_PROC_BROWSER_TEST_F(PaymentRequestNoShippingTest,
+                       OrderSummaryAndClickCancel) {
+  InvokePaymentRequestUI();
+
+  OpenOrderSummaryScreen();
+
+  ResetEventObserver(DialogEvent::DIALOG_CLOSED);
+
+  ClickOnDialogViewAndWait(DialogViewID::CANCEL_BUTTON,
+                           /*wait_for_animation=*/false);
+}
+
 IN_PROC_BROWSER_TEST_F(PaymentRequestNoShippingTest, PayWithVisa) {
   autofill::AutofillProfile billing_address = autofill::test::GetFullProfile();
   AddAutofillProfile(billing_address);
   autofill::CreditCard card = autofill::test::GetCreditCard();
   card.set_billing_address_id(billing_address.guid());
   AddCreditCard(card);  // Visa.
 
   InvokePaymentRequestUI();
 
   ResetEventObserver(DialogEvent::DIALOG_CLOSED);
@@ skipping 180 matching lines @@
   EXPECT_EQ(1u, requests.size());
   std::vector<std::string> supported_card_networks =
       requests[0]->spec()->supported_card_networks();
   EXPECT_EQ(3u, supported_card_networks.size());
   EXPECT_EQ("mastercard", supported_card_networks[0]);
   EXPECT_EQ("visa", supported_card_networks[1]);
   EXPECT_EQ("jcb", supported_card_networks[2]);
 }
 
 }  // namespace payments