[Payment Request] Change the lifetime management of PaymentRequestImpl

chrome/browser/payments/site_per_process_payments_browsertest.cc

 // Copyright 2016 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/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.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/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "url/gurl.h"
@@ skipping 19 matching lines @@
   void SetUpOnMainThread() override {
     https_server_.reset(
         new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS));
     host_resolver()->AddRule("*", "127.0.0.1");
     ASSERT_TRUE(https_server_->InitializeAndListen());
     content::SetupCrossSiteRedirector(https_server_.get());
     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(SitePerProcessPaymentsBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SitePerProcessPaymentsBrowserTest,
                        IframePaymentRequestDoesNotCrash) {
   GURL url = https_server_->GetURL("a.com", "/payment_request_main.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   GURL iframe_url =
       https_server_->GetURL("b.com", "/payment_request_iframe.html");
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "test", iframe_url));
 
   EXPECT_TRUE(tab->GetRenderWidgetHostView()->IsShowing());
   content::RenderFrameHost* frame = ChildFrameAt(tab->GetMainFrame(), 0);
   EXPECT_TRUE(frame);
   EXPECT_NE(frame->GetSiteInstance(), tab->GetMainFrame()->GetSiteInstance());
 }
 
+IN_PROC_BROWSER_TEST_F(SitePerProcessPaymentsBrowserTest,
+                       MultiplePaymentRequests) {
+  GURL url =
+      https_server_->GetURL("a.com", "/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());

[please use gerrit instead, 2017/01/06 21:49:09]

Would you mind adding a different browser test file? site_per_process_* files
are intended only for the OOPIF feature:

http://www.chromium.org/developers/design-documents/oop-iframes

[Mathieu, 2017/01/07 05:03:07]

Done.

+}
+
 }  // namespace payments