| Index: chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
|
| diff --git a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
|
| index 7b85d0d8360c04c80d52f962292aeb007e4a24dd..942286e0a0c9ba63b81609b81d3e77f1436ca7e1 100644
|
| --- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
|
| +++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
|
| @@ -59,14 +59,14 @@ PaymentRequestBrowserTestBase::PaymentRequestBrowserTestBase(
|
| PaymentRequestBrowserTestBase::~PaymentRequestBrowserTestBase() {}
|
|
|
| void PaymentRequestBrowserTestBase::SetUpOnMainThread() {
|
| + // Setup the https server.
|
| https_server_ = base::MakeUnique<net::EmbeddedTestServer>(
|
| net::EmbeddedTestServer::TYPE_HTTPS);
|
| ASSERT_TRUE(https_server_->InitializeAndListen());
|
| https_server_->ServeFilesFromSourceDirectory("chrome/test/data/payments");
|
| https_server_->StartAcceptingConnections();
|
|
|
| - GURL url = https_server()->GetURL(test_file_path_);
|
| - ui_test_utils::NavigateToURL(browser(), url);
|
| + NavigateTo(test_file_path_);
|
|
|
| // Starting now, PaymentRequest Mojo messages sent by the renderer will
|
| // create PaymentRequest objects via this test's CreatePaymentRequestForTest,
|
| @@ -80,6 +80,10 @@ void PaymentRequestBrowserTestBase::SetUpOnMainThread() {
|
| base::Unretained(this), web_contents));
|
| }
|
|
|
| +void PaymentRequestBrowserTestBase::NavigateTo(const std::string& file_path) {
|
| + ui_test_utils::NavigateToURL(browser(), https_server()->GetURL(file_path));
|
| +}
|
| +
|
| void PaymentRequestBrowserTestBase::SetIncognito() {
|
| is_incognito_ = true;
|
| }
|
| @@ -332,6 +336,12 @@ void PaymentRequestBrowserTestBase::ClickOnBackArrow() {
|
| ClickOnDialogViewAndWait(DialogViewID::BACK_BUTTON);
|
| }
|
|
|
| +void PaymentRequestBrowserTestBase::ClickOnCancel() {
|
| + ResetEventObserver(DialogEvent::DIALOG_CLOSED);
|
| +
|
| + ClickOnDialogViewAndWait(DialogViewID::CANCEL_BUTTON, false);
|
| +}
|
| +
|
| content::WebContents* PaymentRequestBrowserTestBase::GetActiveWebContents() {
|
| return browser()->tab_strip_model()->GetActiveWebContents();
|
| }
|
|
|