| Index: chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| index 6ecd53efef568d65ff047954458a936767711694..1b93e7290549a5bb2200d357086379a1a8c27a85 100644
|
| --- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| +++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
|
| @@ -528,6 +528,24 @@ class WebViewInteractiveTest
|
| last_drop_data_ = last_drop_data;
|
| }
|
|
|
| + void FullscreenTestHelper(const std::string& test_name,
|
| + const std::string& test_dir) {
|
| + TestHelper(test_name, test_dir, NO_TEST_SERVER);
|
| + content::WebContents* embedder_web_contents =
|
| + GetFirstAppWindowWebContents();
|
| + ASSERT_TRUE(embedder_web_contents);
|
| + ASSERT_TRUE(guest_web_contents());
|
| + // Click the guest to request fullscreen.
|
| + ExtensionTestMessageListener passed_listener(
|
| + "FULLSCREEN_STEP_PASSED", false);
|
| + passed_listener.set_failure_message("TEST_FAILED");
|
| + content::SimulateMouseClickAt(guest_web_contents(),
|
| + 0,
|
| + blink::WebMouseEvent::ButtonLeft,
|
| + gfx::Point(20, 20));
|
| + ASSERT_TRUE(passed_listener.WaitUntilSatisfied());
|
| + }
|
| +
|
| protected:
|
| TestGuestViewManagerFactory factory_;
|
| content::WebContents* guest_web_contents_;
|
| @@ -998,6 +1016,44 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
|
| NO_TEST_SERVER);
|
| }
|
|
|
| +// Disable this on mac, throws an assertion failure on teardown which
|
| +// will result in flakiness:
|
| +//
|
| +// "not is fullscreen state"
|
| +// "*** Assertion failure in -[_NSWindowFullScreenTransition
|
| +// transitionedWindowFrame],"
|
| +// See similar bug: http://crbug.com/169820.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_FullscreenAllow_EmbedderHasPermission \
|
| + DISABLED_FullscreenAllow_EmbedderHasPermission
|
| +#else
|
| +#define MAYBE_FullscreenAllow_EmbedderHasPermission \
|
| + FullscreenAllow_EmbedderHasPermission
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
|
| + MAYBE_FullscreenAllow_EmbedderHasPermission) {
|
| + FullscreenTestHelper("testFullscreenAllow",
|
| + "web_view/fullscreen/embedder_has_permission");
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
|
| + FullscreenDeny_EmbedderHasPermission) {
|
| + FullscreenTestHelper("testFullscreenDeny",
|
| + "web_view/fullscreen/embedder_has_permission");
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
|
| + FullscreenAllow_EmbedderHasNoPermission) {
|
| + FullscreenTestHelper("testFullscreenAllow",
|
| + "web_view/fullscreen/embedder_has_no_permission");
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
|
| + FullscreenDeny_EmbedderHasNoPermission) {
|
| + FullscreenTestHelper("testFullscreenDeny",
|
| + "web_view/fullscreen/embedder_has_no_permission");
|
| +}
|
| +
|
| // This test exercies the following scenario:
|
| // 1. An <input> in guest has focus.
|
| // 2. User takes focus to embedder by clicking e.g. an <input> in embedder.
|
|
|