OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" | 7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" |
8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
9 | 9 |
10 namespace { | 10 namespace { |
11 | 11 |
12 const char kJavaScriptFeaturesNeeded[] = "--expose-gc"; | 12 const char kJavaScriptFeaturesNeeded[] = "--expose-gc"; |
13 const char kDataChannelHtmlFile[] = "/media/datachannel_test.html"; | 13 const char kDataChannelHtmlFile[] = "/media/datachannel_test.html"; |
14 | 14 |
15 } // namespace | 15 } // namespace |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 | 18 |
19 #if defined(OS_WIN) || (defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)) | 19 // This test is flaky, see https://crbug.com/611620. |
20 // GC does not work correctly in some cases under Android ASAN. | 20 class DISABLED_WebRtcDataChannelTest : public WebRtcContentBrowserTestBase { |
21 // See https://crbug.com/611620. | |
22 // This test has become flaky on Windows. See https://crbug.com/616388 | |
23 #define MAYBE_WebRtcDataChannelTest DISABLED_WebRtcDataChannelTest | |
24 #else | |
25 #define MAYBE_WebRtcDataChannelTest WebRtcDataChannelTest | |
26 #endif | |
27 | |
28 class MAYBE_WebRtcDataChannelTest : public WebRtcContentBrowserTestBase { | |
29 public: | 21 public: |
30 MAYBE_WebRtcDataChannelTest() {} | 22 DISABLED_WebRtcDataChannelTest() {} |
31 ~MAYBE_WebRtcDataChannelTest() override {} | 23 ~DISABLED_WebRtcDataChannelTest() override {} |
32 | 24 |
33 void SetUpCommandLine(base::CommandLine* command_line) override { | 25 void SetUpCommandLine(base::CommandLine* command_line) override { |
34 WebRtcContentBrowserTestBase::SetUpCommandLine(command_line); | 26 WebRtcContentBrowserTestBase::SetUpCommandLine(command_line); |
35 AppendUseFakeUIForMediaStreamFlag(); | 27 AppendUseFakeUIForMediaStreamFlag(); |
36 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 28 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
37 switches::kJavaScriptFlags, kJavaScriptFeaturesNeeded); | 29 switches::kJavaScriptFlags, kJavaScriptFeaturesNeeded); |
38 } | 30 } |
39 | 31 |
40 private: | 32 private: |
41 DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcDataChannelTest); | 33 DISALLOW_COPY_AND_ASSIGN(DISABLED_WebRtcDataChannelTest); |
42 }; | 34 }; |
43 | 35 |
44 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataChannelTest, DataChannelGC) { | 36 IN_PROC_BROWSER_TEST_F(DISABLED_WebRtcDataChannelTest, DataChannelGC) { |
45 MakeTypicalCall("testDataChannelGC();", kDataChannelHtmlFile); | 37 MakeTypicalCall("testDataChannelGC();", kDataChannelHtmlFile); |
46 } | 38 } |
47 | 39 |
48 } // namespace content | 40 } // namespace content |
OLD | NEW |