[Payments] Record CanMakePayment metrics on Desktop.

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

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..776e1a9f8474036fcfd028369c869f5746a22225 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,7 @@ void PaymentRequestBrowserTestBase::SetUpCommandLine(
 }
 
 void PaymentRequestBrowserTestBase::SetUpOnMainThread() {
-  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 +82,17 @@ void PaymentRequestBrowserTestBase::SetUpOnMainThread() {
                  base::Unretained(this), web_contents));
 }
 
+void PaymentRequestBrowserTestBase::NavigateTo(const std::string& file_path) {
+  https_server_ = base::MakeUnique<net::EmbeddedTestServer>(

[Mathieu, 2017/05/02 20:56:46]

should not reinitialize the server everytime we want to navigate. You can keep
86-90 in SetUpOnMainThread

[sebsg, 2017/05/02 22:15:08]

Done.

+      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_);

[Mathieu, 2017/05/02 20:56:47]

this should be |file_path|

[sebsg, 2017/05/02 22:15:08]

Done.

+  ui_test_utils::NavigateToURL(browser(), url);

[Mathieu, 2017/05/02 20:56:47]

inline https_server()->GetURL(test_file_path_)

[sebsg, 2017/05/02 22:15:08]

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();
 }