Commit 4572fe08 authored by Lukasz Anforowicz's avatar Lukasz Anforowicz Committed by Commit Bot

Disable tests that flakily repro a UaF when run with --site-per-process.

Bug: 835577, 835578
Change-Id: I4461cec21b31ee9945afe4e2b1df7c89d9905168
Reviewed-on: https://chromium-review.googlesource.com/1024401
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552949}
parent f14c9698
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "content/public/test/download_test_observer.h" #include "content/public/test/download_test_observer.h"
#include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "ui/base/page_transition_types.h" #include "ui/base/page_transition_types.h"
...@@ -768,6 +769,13 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignTab) { ...@@ -768,6 +769,13 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignTab) {
} }
IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) { IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) {
#if defined(ADDRESS_SANITIZER)
// TODO(lukasza): https://crbug.com/835578: Flaky UaF when running with
// site-per-process.
if (content::AreAllSitesIsolatedForTesting())
return;
#endif
Profile* profile = browser()->profile(); Profile* profile = browser()->profile();
GURL url1("http://google.com"); GURL url1("http://google.com");
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -793,6 +794,13 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) { ...@@ -793,6 +794,13 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) {
// same thing. // same thing.
IN_PROC_BROWSER_TEST_F(TabRestoreTest, IN_PROC_BROWSER_TEST_F(TabRestoreTest,
RestoreFirstBrowserWhenSessionServiceEnabled) { RestoreFirstBrowserWhenSessionServiceEnabled) {
#if defined(ADDRESS_SANITIZER)
// TODO(lukasza): https://crbug.com/835577: Flaky UaF when running with
// site-per-process.
if (content::AreAllSitesIsolatedForTesting())
return;
#endif
// Do not exit from test when last browser is closed. // Do not exit from test when last browser is closed.
ScopedKeepAlive keep_alive(KeepAliveOrigin::SESSION_RESTORE, ScopedKeepAlive keep_alive(KeepAliveOrigin::SESSION_RESTORE,
KeepAliveRestartOption::DISABLED); KeepAliveRestartOption::DISABLED);
......
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