Commit 103a966d authored by Ehsan Karamad's avatar Ehsan Karamad Committed by Commit Bot

[ MimeHandlerView ] Do not run BrowserPlugin tests in CP mode

This CL makes sure certain ChromeMimeHandlerView tests do not run run
with MimeHandlerViewInCrossProcessFrame; these tests expect the MHV
to run BrowserPlugin which is not the case with the flag.

Bug: 961786
Change-Id: Idbf568be5dd2e38d6677084dea37e6e563795ac9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1611966Reviewed-by: default avatarJames MacLean <wjmaclean@chromium.org>
Commit-Queue: Ehsan Karamad <ekaramad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659672}
parent b277429c
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/mime_handler_view_mode.h"
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "content/public/test/find_test_utils.h" #include "content/public/test/find_test_utils.h"
#include "content/public/test/hit_test_region_observer.h" #include "content/public/test/hit_test_region_observer.h"
...@@ -252,6 +253,11 @@ class FocusChangeWaiter { ...@@ -252,6 +253,11 @@ class FocusChangeWaiter {
// from the unattached guest. For more context see https://crbug.com/897465. // from the unattached guest. For more context see https://crbug.com/897465.
IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
NoFindInPageForUnattachedGuest) { NoFindInPageForUnattachedGuest) {
if (content::MimeHandlerViewMode::UsesCrossProcessFrame()) {
// This test requires BrowserPlugin which does not exist in frame-based
// MimeHandlerView.
return;
}
InitializeTestPage(embedded_test_server()->GetURL("/testBasic.csv")); InitializeTestPage(embedded_test_server()->GetURL("/testBasic.csv"));
auto* main_frame = embedder_web_contents()->GetMainFrame(); auto* main_frame = embedder_web_contents()->GetMainFrame();
auto* attached_guest_main_frame = guest_web_contents()->GetMainFrame(); auto* attached_guest_main_frame = guest_web_contents()->GetMainFrame();
...@@ -295,6 +301,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, ...@@ -295,6 +301,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
UnderChildFrame) { UnderChildFrame) {
if (content::MimeHandlerViewMode::UsesCrossProcessFrame()) {
// This test requires BrowserPlugin which does not exist in frame-based
// MimeHandlerView.
return;
}
// Create this frame tree structure. // Create this frame tree structure.
// main_frame_node // main_frame_node
// | // |
...@@ -328,6 +339,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, ...@@ -328,6 +339,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
#endif #endif
IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
MAYBE_BP_AutoResizeMessages) { MAYBE_BP_AutoResizeMessages) {
if (content::MimeHandlerViewMode::UsesCrossProcessFrame()) {
// This test requires BrowserPlugin which does not exist in frame-based
// MimeHandlerView.
return;
}
InitializeTestPage(embedded_test_server()->GetURL("/testBasic.csv")); InitializeTestPage(embedded_test_server()->GetURL("/testBasic.csv"));
// Helper function as this test requires inspecting a number of content:: // Helper function as this test requires inspecting a number of content::
...@@ -350,6 +366,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, ...@@ -350,6 +366,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
#endif #endif
IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
MAYBE_TouchFocusesEmbedder) { MAYBE_TouchFocusesEmbedder) {
if (content::MimeHandlerViewMode::UsesCrossProcessFrame()) {
// This test requires BrowserPlugin which does not exist in frame-based
// MimeHandlerView.
return;
}
InitializeTestPage(embedded_test_server()->GetURL("/testBasic.csv")); InitializeTestPage(embedded_test_server()->GetURL("/testBasic.csv"));
content::RenderViewHost* embedder_rvh = content::RenderViewHost* embedder_rvh =
...@@ -445,6 +466,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, ...@@ -445,6 +466,11 @@ IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest, IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginTest,
TouchFocusesBrowserPluginInEmbedder) { TouchFocusesBrowserPluginInEmbedder) {
if (content::MimeHandlerViewMode::UsesCrossProcessFrame()) {
// This test requires BrowserPlugin which does not exist in frame-based
// MimeHandlerView.
return;
}
InitializeTestPage(embedded_test_server()->GetURL("/test_embedded.html")); InitializeTestPage(embedded_test_server()->GetURL("/test_embedded.html"));
auto embedder_rect = embedder_web_contents()->GetContainerBounds(); auto embedder_rect = embedder_web_contents()->GetContainerBounds();
...@@ -506,6 +532,11 @@ class ChromeMimeHandlerViewBrowserPluginScrollTest ...@@ -506,6 +532,11 @@ class ChromeMimeHandlerViewBrowserPluginScrollTest
#endif #endif
IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginScrollTest, IN_PROC_BROWSER_TEST_F(ChromeMimeHandlerViewBrowserPluginScrollTest,
MAYBE_ScrollGuestContent) { MAYBE_ScrollGuestContent) {
if (content::MimeHandlerViewMode::UsesCrossProcessFrame()) {
// This test requires BrowserPlugin which does not exist in frame-based
// MimeHandlerView.
return;
}
InitializeTestPage(embedded_test_server()->GetURL("/test_embedded.html")); InitializeTestPage(embedded_test_server()->GetURL("/test_embedded.html"));
ASSERT_TRUE(ExecuteScript(guest_web_contents(), "ensurePageIsScrollable();")); ASSERT_TRUE(ExecuteScript(guest_web_contents(), "ensurePageIsScrollable();"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment