[Payment Request] Change the lifetime management of PaymentRequestImpl

chrome/browser/payments/payment_request_web_contents_manager_browsertest.cc

Index: chrome/browser/payments/payment_request_web_contents_manager_browsertest.cc
diff --git a/chrome/browser/payments/payment_request_web_contents_manager_browsertest.cc b/chrome/browser/payments/payment_request_web_contents_manager_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8f2cbd392f7f69e077258180dc8596dd292aecea
--- /dev/null
+++ b/chrome/browser/payments/payment_request_web_contents_manager_browsertest.cc
@@ -0,0 +1,78 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.

[please use gerrit instead, 2017/01/09 14:50:13]

2017

[Mathieu, 2017/01/09 16:54:19]

Doh! I should be used to it around February

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <vector>
+
+#include "base/command_line.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "components/payments/payment_request_impl.h"
+#include "components/payments/payment_request_web_contents_manager.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "url/gurl.h"
+
+namespace payments {
+
+class PaymentRequestWebContentsManagerBrowserTest
+    : public InProcessBrowserTest {
+ public:
+  PaymentRequestWebContentsManagerBrowserTest() {}
+  ~PaymentRequestWebContentsManagerBrowserTest() override {}
+
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    InProcessBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(
+        switches::kEnableExperimentalWebPlatformFeatures);
+  }
+
+  void SetUpOnMainThread() override {
+    https_server_.reset(
+        new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS));
+    ASSERT_TRUE(https_server_->InitializeAndListen());
+    content::SetupCrossSiteRedirector(https_server_.get());

[please use gerrit instead, 2017/01/09 14:50:13]

No need for cross-site redirector when not testing cross-site iframes.

[Mathieu, 2017/01/09 16:54:19]

Done.

+    https_server_->ServeFilesFromSourceDirectory("chrome/test/data");
+    https_server_->StartAcceptingConnections();
+  }
+
+  // Convenience method to get a list of PaymentRequestImpl associated with
+  // |web_contents|.
+  const std::vector<PaymentRequestImpl*> GetPaymentRequestImpls(
+      content::WebContents* web_contents) {
+    PaymentRequestWebContentsManager* manager =
+        PaymentRequestWebContentsManager::GetOrCreateForWebContents(
+            web_contents);
+    if (!manager)
+      return std::vector<PaymentRequestImpl*>();
+
+    std::vector<PaymentRequestImpl*> payment_requests_ptrs;
+    for (const auto& p : manager->payment_requests_) {
+      payment_requests_ptrs.push_back(p.first);
+    }
+    return payment_requests_ptrs;
+  }
+
+  std::unique_ptr<net::EmbeddedTestServer> https_server_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PaymentRequestWebContentsManagerBrowserTest);
+};
+
+IN_PROC_BROWSER_TEST_F(PaymentRequestWebContentsManagerBrowserTest,
+                       MultiplePaymentRequests) {
+  GURL url = https_server_->GetURL("127.0.0.1",

[please use gerrit instead, 2017/01/09 14:50:13]

Hostnames are important only for cross-site iframe testing. Here you can omit
"127.0.0.1":

GURL url = https_server_->GetURL("/payment_request_multiple_requests.html");

[Mathieu, 2017/01/09 16:54:19]

Done.

+                                   "/payment_request_multiple_requests.html");
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  const std::vector<PaymentRequestImpl*> payment_requests =
+      GetPaymentRequestImpls(
+          browser()->tab_strip_model()->GetActiveWebContents());
+  EXPECT_EQ(5U, payment_requests.size());
+}
+
+}  // namespace payments