Skip to content

GitLab

T
tangled
Commit 8eb68052 authored by Ehsan Karamad's avatar Ehsan Karamad Committed by Commit Bot
Browse files
Options

Move BrowserPluginSpecific tests out of web_view_browsertest.cc 

The WebViewBrowserPluginSpecificTest class includes tests which use a
BrowserPluign-based GuestView. Since all GuestViews except MimeHandlerViewGuest
are now based on cross-process frames, these tests should not be implemented as
WebViewGuest tests anymore.

This CL introduces a new chrome browser test target for such
BrowserPluginSpecific tests where the tests instantiate a MimeHandlerViewGuest
instead of a <webview>.

Ideally, the tests should have lived with the rest of MimeHandlerViewTests in
extension layer; however, due to chrome layer dependencies it is not possible.

Bug: 659750, 533069, 330264, 870604
Change-Id: Ica252a60e94bad47cabbff8b9275b8f9fb05d7ae
Reviewed-on: https://chromium-review.googlesource.com/1168734
Commit-Queue: Ehsan Karamad <ekaramad@chromium.org>
Reviewed-by: default avatarJames MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582345}
parent 1f273ccb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 332 additions and 209 deletions
chrome/browser/apps/guest_view/web_view_browsertest.cc
View file @ 8eb68052
......@@ -233,23 +233,6 @@ void ExecuteScriptWaitForTitle(content::WebContents* web_contents,
}
#if defined (USE_AURA)
views::View* FindWebView(views::View* view) {
base::queue<views::View*> queue;
queue.push(view);
while (!queue.empty()) {
views::View* current = queue.front();
queue.pop();
if (std::string(current->GetClassName()).find("WebView") !=
std::string::npos) {
return current;
}
for (int i = 0; i < current->child_count(); ++i)
queue.push(current->child_at(i));
}
return nullptr;
}
// Waits for select control shown/closed.
class SelectControlWaiter : public aura::WindowObserver,
public aura::EnvObserver {
......@@ -4175,65 +4158,6 @@ class WebViewScrollGuestContentBrowserPluginSpecificTest
}
};
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_ScrollGuestContent DISABLED_ScrollGuestContent
#else
#define MAYBE_ScrollGuestContent ScrollGuestContent
#endif
IN_PROC_BROWSER_TEST_F(WebViewScrollGuestContentBrowserPluginSpecificTest,
MAYBE_ScrollGuestContent) {
LoadAppWithGuest("web_view/scrollable_embedder_and_guest");
content::WebContents* embedder_contents = GetEmbedderWebContents();
content::RenderFrameSubmissionObserver embedder_frame_observer(
embedder_contents);
std::vector<content::WebContents*> guest_web_contents_list;
GetGuestViewManager()->WaitForNumGuestsCreated(1u);
GetGuestViewManager()->GetGuestWebContentsList(&guest_web_contents_list);
ASSERT_EQ(1u, guest_web_contents_list.size());
content::WebContents* guest_contents = guest_web_contents_list[0];
content::RenderFrameSubmissionObserver guest_frame_observer(guest_contents);
gfx::Rect embedder_rect = embedder_contents->GetContainerBounds();
gfx::Rect guest_rect = guest_contents->GetContainerBounds();
guest_rect.set_x(guest_rect.x() - embedder_rect.x());
guest_rect.set_y(guest_rect.y() - embedder_rect.y());
gfx::Vector2dF default_offset;
guest_frame_observer.WaitForScrollOffset(default_offset);
embedder_frame_observer.WaitForScrollOffset(default_offset);
gfx::Point guest_scroll_location(guest_rect.width() / 2, 0);
float gesture_distance = 15.f;
{
gfx::Vector2dF expected_offset(0.f, gesture_distance);
content::SimulateGestureScrollSequence(
guest_contents, guest_scroll_location,
gfx::Vector2dF(0, -gesture_distance));
guest_frame_observer.WaitForScrollOffset(expected_offset);
}
embedder_frame_observer.WaitForScrollOffset(default_offset);
// Use fling gesture to scroll back, velocity should be big enough to scroll
// content back.
float fling_velocity = 300.f;
{
content::SimulateGestureFlingSequence(
guest_contents, guest_scroll_location,
gfx::Vector2dF(0, fling_velocity));
guest_frame_observer.WaitForScrollOffset(default_offset);
}
embedder_frame_observer.WaitForScrollOffset(default_offset);
}
#if defined(USE_AURA)
// This verifies the fix for crbug.com/694393 .
IN_PROC_BROWSER_TEST_F(WebViewScrollGuestContentBrowserPluginSpecificTest,
......@@ -4285,119 +4209,6 @@ IN_PROC_BROWSER_TEST_F(WebViewScrollGuestContentBrowserPluginSpecificTest,
}
#endif
#if defined(USE_AURA)
// TODO(wjmaclean): when WebViewTest is re-enabled on the site-isolation
// bots, then re-enable this test class as well.
// https://crbug.com/503751
class WebViewFocusBrowserPluginSpecificTest
: public WebViewBrowserPluginSpecificTest {
public:
~WebViewFocusBrowserPluginSpecificTest() override {}
void SetUpCommandLine(base::CommandLine* command_line) override {
WebViewBrowserPluginSpecificTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(
switches::kTouchEventFeatureDetection,
switches::kTouchEventFeatureDetectionEnabled);
}
void ForceCompositorFrame(
content::RenderFrameSubmissionObserver& frame_observer) {
while (!RequestFrame(GetEmbedderWebContents())) {
// RequestFrame failed because we were waiting on an ack ... wait a short
// time and retry.
base::RunLoop run_loop;
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(10));
run_loop.Run();
}
frame_observer.WaitForAnyFrameSubmission();
}
};
// Flaky on Linux. See: https://crbug.com/870604.
#if defined(OS_LINUX)
#define MAYBE_TouchFocusesEmbedder DISABLED_TouchFocusesEmbedder
#else
#define MAYBE_TouchFocusesEmbedder TouchFocusesEmbedder
#endif
// The following test verifies that a views::WebView hosting an embedder
// gains focus on touchstart.
IN_PROC_BROWSER_TEST_F(WebViewFocusBrowserPluginSpecificTest,
MAYBE_TouchFocusesEmbedder) {
LoadAppWithGuest("web_view/accept_touch_events");
content::WebContents* web_contents = GetEmbedderWebContents();
content::RenderViewHost* embedder_rvh = web_contents->GetRenderViewHost();
content::RenderFrameSubmissionObserver frame_observer(
GetEmbedderWebContents());
bool embedder_has_touch_handler =
content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh);
EXPECT_FALSE(embedder_has_touch_handler);
SendMessageToGuestAndWait("install-touch-handler", "installed-touch-handler");
// Note that we need to wait for the installed/registered touch handler to
// appear in browser process before querying |embedder_rvh|.
// In practice, since we do a roundrtip from browser process to guest and
// back, this is sufficient.
embedder_has_touch_handler =
content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh);
EXPECT_TRUE(embedder_has_touch_handler);
extensions::AppWindow* app_window = GetFirstAppWindowForBrowser(browser());
aura::Window* window = app_window->GetNativeWindow();
EXPECT_TRUE(app_window);
EXPECT_TRUE(window);
views::Widget* widget = views::Widget::GetWidgetForNativeView(window);
EXPECT_TRUE(widget->GetRootView());
// We only expect a single views::webview in the view hierarchy.
views::View* aura_webview = FindWebView(widget->GetRootView());
ASSERT_TRUE(aura_webview);
gfx::Rect bounds(aura_webview->bounds());
EXPECT_TRUE(aura_webview->IsFocusable());
views::View* other_focusable_view = new views::View();
other_focusable_view->SetBounds(bounds.x() + bounds.width(), bounds.y(), 100,
100);
other_focusable_view->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
// Focusable views require an accessible name to pass accessibility checks.
other_focusable_view->GetViewAccessibility().OverrideName("Any name");
aura_webview->parent()->AddChildView(other_focusable_view);
other_focusable_view->SetPosition(gfx::Point(bounds.x() + bounds.width(), 0));
// Sync changes to compositor.
ForceCompositorFrame(frame_observer);
aura_webview->RequestFocus();
// Verify that other_focusable_view can steal focus from aura_webview.
EXPECT_TRUE(aura_webview->HasFocus());
other_focusable_view->RequestFocus();
EXPECT_TRUE(other_focusable_view->HasFocus());
EXPECT_FALSE(aura_webview->HasFocus());
// Compute location of guest within embedder so we can more accurately
// target our touch event.
gfx::Rect guest_rect = GetGuestWebContents()->GetContainerBounds();
gfx::Point embedder_origin =
GetEmbedderWebContents()->GetContainerBounds().origin();
guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y());
// Generate and send synthetic touch event.
content::InputEventAckWaiter waiter(
GetGuestWebContents()->GetRenderWidgetHostView()->GetRenderWidgetHost(),
blink::WebInputEvent::kTouchStart);
content::SimulateTouchPressAt(GetEmbedderWebContents(),
guest_rect.CenterPoint());
waiter.Wait();
EXPECT_TRUE(aura_webview->HasFocus());
}
#endif
// This runs the chrome://chrome-signin page which includes an OOPIF-<webview>
// of accounts.google.com.
class ChromeSignInWebViewTest : public WebViewTest {
......@@ -4615,23 +4426,3 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, AutoResizeMessages) {
embedder->GetRenderWidgetHostView()->GetRenderWidgetHost()->GetProcess(),
guest->GetRenderWidgetHostView()->GetRenderWidgetHost()));
}
// Flaky under MSan: crbug.com/837757
#if defined(MEMORY_SANITIZER)
#define MAYBE_BP_AutoResizeMessages DISABLED_AutoResizeMessages
#else
#define MAYBE_BP_AutoResizeMessages AutoResizeMessages
#endif
IN_PROC_BROWSER_TEST_F(WebViewBrowserPluginSpecificTest,
MAYBE_BP_AutoResizeMessages) {
LoadAppWithGuest("web_view/simple");
content::WebContents* embedder = GetEmbedderWebContents();
content::WebContents* guest = GetGuestWebContents();
// Helper function as this test requires inspecting a number of content::
// internal objects.
EXPECT_TRUE(content::TestChildOrGuestAutoresize(
true,
embedder->GetRenderWidgetHostView()->GetRenderWidgetHost()->GetProcess(),
guest->GetRenderWidgetHostView()->GetRenderWidgetHost()));
}
chrome/test/BUILD.gn
View file @ 8eb68052
......@@ -573,6 +573,7 @@ test("browser_tests") {
"../browser/favicon/content_favicon_driver_browsertest.cc",
"../browser/first_run/first_run_browsertest.cc",
"../browser/geolocation/geolocation_browsertest.cc",
"../browser/guest_view/mime_handler_view/chrome_mime_handler_view_browsertest.cc",
"../browser/history/history_browsertest.cc",
"../browser/history/redirect_browsertest.cc",
"../browser/iframe_browsertest.cc",
......
chrome/test/data/extensions/api_test/mime_handler_view/index.js
View file @ 8eb68052
......@@ -62,6 +62,14 @@ function checkStreamDetailsNoFile() {
function dummyTouchStartHandler(e) {
}
function ensurePageIsScrollable() {
document.body.style = " width: 100%; height: 100%; overflow: scroll;";
let div = document.createElement("div");
div.style = "width: 1000px; height: 500px; margin: 50%;";
document.body.appendChild(div);
window.scrollTo(0, 0);
}
var tests = [
function testBasic() {
checkStreamDetails('testBasic.csv', false);
......
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