| Index: content/browser/media/webrtc/webrtc_datachannel_browsertest.cc
|
| diff --git a/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc b/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc
|
| index e2d358b6462d8bd712613b6066162579e5dfcc4a..fb38cc7145847ffa5791808b6f45971a9761a9b9 100644
|
| --- a/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc
|
| +++ b/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc
|
| @@ -16,10 +16,18 @@ const char kDataChannelHtmlFile[] = "/media/datachannel_test.html";
|
|
|
| namespace content {
|
|
|
| -class WebRtcDataChannelTest : public WebRtcContentBrowserTest {
|
| +#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
|
| +// GC does not work correctly in some cases under Android ASAN.
|
| +// See https://crbug.com/611620.
|
| +#define MAYBE_WebRtcDataChannelTest DISABLED_WebRtcDataChannelTest
|
| +#else
|
| +#define MAYBE_WebRtcDataChannelTest WebRtcDataChannelTest
|
| +#endif
|
| +
|
| +class MAYBE_WebRtcDataChannelTest : public WebRtcContentBrowserTest {
|
| public:
|
| - WebRtcDataChannelTest() {}
|
| - ~WebRtcDataChannelTest() override {}
|
| + MAYBE_WebRtcDataChannelTest() {}
|
| + ~MAYBE_WebRtcDataChannelTest() override {}
|
|
|
| void SetUpCommandLine(base::CommandLine* command_line) override {
|
| WebRtcContentBrowserTest::SetUpCommandLine(command_line);
|
| @@ -29,10 +37,10 @@ class WebRtcDataChannelTest : public WebRtcContentBrowserTest {
|
| }
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(WebRtcDataChannelTest);
|
| + DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcDataChannelTest);
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcDataChannelTest, DataChannelGC) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataChannelTest, DataChannelGC) {
|
| MakeTypicalCall("testDataChannelGC();", kDataChannelHtmlFile);
|
| }
|
|
|
|
|