| Index: chrome/browser/media/chrome_webrtc_browsertest.cc
|
| diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc
|
| index 5da965e53b52fe90ffd2c77143da077df9a6392f..294fa09de6ac75bcfaeec26c8b8698e8d06eae3c 100644
|
| --- a/chrome/browser/media/chrome_webrtc_browsertest.cc
|
| +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc
|
| @@ -34,10 +34,18 @@
|
| static const char kMainWebrtcTestHtmlPage[] =
|
| "/webrtc/webrtc_jsep01_test.html";
|
|
|
| +// Temporarily disabled on Linux.
|
| +// http://crbug.com/281268.
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_WebrtcBrowserTest DISABLED_WebrtcBrowserTest
|
| +#else
|
| +#define MAYBE_WebrtcBrowserTest WebrtcBrowserTest
|
| +#endif
|
| +
|
| // Top-level integration test for WebRTC. Requires a real webcam and microphone
|
| // on the running system. This test is not meant to run in the main browser
|
| // test suite since normal tester machines do not have webcams.
|
| -class WebrtcBrowserTest : public WebRtcTestBase {
|
| +class MAYBE_WebrtcBrowserTest : public WebRtcTestBase {
|
| public:
|
| virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
|
| @@ -188,7 +196,7 @@ class WebrtcBrowserTest : public WebRtcTestBase {
|
| PeerConnectionServerRunner peerconnection_server_;
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| ASSERT_TRUE(peerconnection_server_.Start());
|
| @@ -214,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| ASSERT_TRUE(peerconnection_server_.Stop());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CpuUsage15Seconds) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, MANUAL_CpuUsage15Seconds) {
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| ASSERT_TRUE(peerconnection_server_.Start());
|
|
|
| @@ -265,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CpuUsage15Seconds) {
|
| ASSERT_TRUE(peerconnection_server_.Stop());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| MANUAL_TestMediaStreamTrackEnableDisable) {
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| ASSERT_TRUE(peerconnection_server_.Start());
|
| @@ -299,7 +307,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| ASSERT_TRUE(peerconnection_server_.Stop());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetrics) {
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| ASSERT_TRUE(peerconnection_server_.Start());
|
|
|