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 4324a579c4f55efd9f08bf81086e28de08791230..74722f62c191f0f22ae559ee6de56f8c2add7cc1 100644 |
--- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc |
+++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc |
@@ -68,14 +68,14 @@ void PaymentRequestBrowserTestBase::SetUpCommandLine( |
} |
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, |
@@ -89,6 +89,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)); |
Mathieu
2017/05/03 02:22:49
can you use NavigateTo in other tests where we wer
sebsg
2017/05/03 17:10:11
Done.
|
+} |
+ |
void PaymentRequestBrowserTestBase::SetIncognito() { |
is_incognito_ = true; |
} |
@@ -317,6 +321,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(); |
} |