Click to Open PDF: Add EMBED browsertest

This re-adds the previously approved and committed browsertest, but this time with a fix for the flakiness. The body of the test remains the same, but with an extra call to: PluginTestUtils::WaitForPlaceholderReady(GetActiveWebContents(), "pdf_embed"); There is also an update the command line flags and an extra include. This is patch 3/3 for this objective. Bug: 887752, 879149, 878871 Change-Id: Ie8c70d68fb3e3ebf9e70e5d9f2f1aa2f37b190f4 Reviewed-on: https://chromium-review.googlesource.com/c/1336086Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tommy Li <tommycli@chromium.org> Cr-Commit-Position: refs/heads/master@{#608411}

Click to Open PDF: Add EMBED browsertest
This re-adds the previously approved and committed browsertest, but this time with a fix for the flakiness. The body of the test remains the same, but with an extra call to: PluginTestUtils::WaitForPlaceholderReady(GetActiveWebContents(), "pdf_embed"); There is also an update the command line flags and an extra include. This is patch 3/3 for this objective. Bug: 887752, 879149, 878871 Change-Id: Ie8c70d68fb3e3ebf9e70e5d9f2f1aa2f37b190f4 Reviewed-on: https://chromium-review.googlesource.com/c/1336086Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tommy Li <tommycli@chromium.org> Cr-Commit-Position: refs/heads/master@{#608411}
1c886c53 · Tommy C. Li · Commit Bot · 960996fe · 1c886c53 · 1c886c53
Commit 1c886c53 authored Nov 15, 2018 by Tommy C. Li Committed by Commit Bot Nov 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 1 deletion

chrome/browser/pdf/pdf_extension_test.cc chrome/browser/pdf/pdf_extension_test.cc +31 -0

chrome/test/data/pdf/pdf_embed_csp.html chrome/test/data/pdf/pdf_embed_csp.html +1 -1

No files found.
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/pdf/pdf_extension_test_util.h"
 #include "chrome/browser/pdf/pdf_extension_util.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
+#include "chrome/browser/plugins/plugin_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
@@ -61,6 +62,7 @@
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
@@ -430,6 +432,12 @@ class PDFPluginDisabledTest : public PDFExtensionTest {
  PDFPluginDisabledTest() {}

 protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    PDFExtensionTest::SetUpCommandLine(command_line);
+
+    command_line->AppendSwitch(switches::kEnablePluginPlaceholderTesting);
+  }
+
  void SetUpOnMainThread() override {
    PDFExtensionTest::SetUpOnMainThread();

@@ -492,6 +500,29 @@ IN_PROC_BROWSER_TEST_F(PDFPluginDisabledTest, DirectNavigationToPDF) {
  EXPECT_EQ(0, CountPDFProcesses());
 }

+IN_PROC_BROWSER_TEST_F(PDFPluginDisabledTest, EmbedPdfPlaceholderWithCSP) {
+  // Navigate to a page with CSP that uses <embed> to embed a PDF as a plugin.
+  GURL embed_page_url =
+      embedded_test_server()->GetURL("/pdf/pdf_embed_csp.html");
+  ui_test_utils::NavigateToURL(browser(), embed_page_url);
+  PluginTestUtils::WaitForPlaceholderReady(GetActiveWebContents(), "pdf_embed");
+
+  // Fake a click on the <embed>, then press Enter to trigger the download.
+  gfx::Point point_in_pdf(100, 100);
+  content::SimulateRoutedMouseClickAt(
+      GetActiveWebContents(), kDefaultKeyModifier,
+      blink::WebMouseEvent::Button::kLeft, point_in_pdf);
+  content::SimulateKeyPress(GetActiveWebContents(), ui::DomKey::ENTER,
+                            ui::DomCode::ENTER, ui::VKEY_RETURN, false, false,
+                            false, false);
+
+  // Validate that we downloaded a single PDF and didn't launch the PDF plugin.
+  GURL pdf_url(embedded_test_server()->GetURL("/pdf/test.pdf"));
+  EXPECT_EQ(pdf_url, AwaitAndGetLastDownloadedUrl());
+  EXPECT_EQ(1u, GetNumberOfDownloads());
+  EXPECT_EQ(0, CountPDFProcesses());
+}
+
 IN_PROC_BROWSER_TEST_F(PDFPluginDisabledTest, IframePdfPlaceholderWithCSP) {
  // Navigate to a page that uses <iframe> to embed a PDF as a plugin.
  GURL iframe_page_url =

--- a/chrome/test/data/pdf/pdf_embed_csp.html
+++ b/chrome/test/data/pdf/pdf_embed_csp.html
@@ -6,7 +6,7 @@
                 style-src 'unsafe-inline'">
  </head>
  <body>
-    <embed type="application/pdf" src="test.pdf"
+    <embed id="pdf_embed" type="application/pdf" src="test.pdf"
        style="position: fixed; top: 50; left: 50; width: 500; height: 600">
  </body>
 </html>