Commit 30ba9b7b authored by Donn Denman's avatar Donn Denman Committed by Commit Bot

Disable PortalBrowserTest.ActivatePortal: flaky.

Introduced recently in CL https://chromium-review.googlesource.com/c/chromium/src/+/1262090.

BUG=892669

Change-Id: I9b69ba69c0a950c11de218a622bce041b4b6a98f
Reviewed-on: https://chromium-review.googlesource.com/c/1265156Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597226}
parent 62a02100
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/callback.h" #include "base/callback.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/frame_host/render_frame_host_impl.h"
#include "content/browser/portal/portal.h" #include "content/browser/portal/portal.h"
#include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
...@@ -22,7 +23,6 @@ ...@@ -22,7 +23,6 @@
#include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/portal/portal.mojom.h" #include "third_party/blink/public/mojom/portal/portal.mojom.h"
#include "url/url_constants.h" #include "url/url_constants.h"
using testing::_; using testing::_;
namespace content { namespace content {
...@@ -302,7 +302,14 @@ IN_PROC_BROWSER_TEST_F(PortalBrowserTest, NavigatePortal) { ...@@ -302,7 +302,14 @@ IN_PROC_BROWSER_TEST_F(PortalBrowserTest, NavigatePortal) {
// Tests that the WebContentsDelegate will receive a request to swap the // Tests that the WebContentsDelegate will receive a request to swap the
// WebContents when a portal is activated. // WebContents when a portal is activated.
IN_PROC_BROWSER_TEST_F(PortalBrowserTest, ActivatePortal) { // Disabled due to flakiness on Android. See https://crbug.com/892669.
#if defined(OS_ANDROID)
#define MAYBE_ActivatePortal DISABLED_ActivatePortal
#else
#define MAYBE_ActivatePortal ActivatePortal
#endif
IN_PROC_BROWSER_TEST_F(PortalBrowserTest, MAYBE_ActivatePortal) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), embedded_test_server()->GetURL("portal.test", "/title1.html"))); shell(), embedded_test_server()->GetURL("portal.test", "/title1.html")));
WebContentsImpl* web_contents_impl = WebContentsImpl* web_contents_impl =
......
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