| Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| index 36bb9a64721b67b898decb7dd4ac7374e2be8838..b7a055cfef35416e05887cfee2dde61823c1e000 100644
|
| --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| @@ -23,6 +23,7 @@
|
| #include "content/public/test/content_browser_test_utils.h"
|
| #include "content/public/test/test_utils.h"
|
| #include "content/shell/browser/shell.h"
|
| +#include "media/audio/audio_manager.h"
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
| #include "testing/perf/perf_test.h"
|
|
|
| @@ -579,6 +580,31 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| ExecuteJavascriptAndReturnResult(call));
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| +// Disabled until http://crbug.com/679302 is fixed.
|
| +#define MAYBE_GetUserMediaFailToAccessAudioDevice \
|
| + DISABLED_GetUserMediaFailToAccessAudioDevice
|
| +#else
|
| +#define MAYBE_GetUserMediaFailToAccessAudioDevice \
|
| + GetUserMediaFailToAccessAudioDevice
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| + MAYBE_GetUserMediaFailToAccessAudioDevice) {
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
| +
|
| + GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| + NavigateToURL(shell(), url);
|
| +
|
| + // Set the maximum allowed input and output streams to 0
|
| + // so that the call to create a new audio input stream will fail.
|
| + media::AudioManager::Get()->SetMaxStreamCountForTesting(0, 0);
|
| +
|
| + const std::string call = base::StringPrintf(
|
| + "%s({video: false, audio: true});", kGetUserMediaAndExpectFailure);
|
| + EXPECT_EQ("TrackStartError",
|
| + ExecuteJavascriptAndReturnResult(call));
|
| +}
|
| +
|
| // This test makes two getUserMedia requests, one with impossible constraints
|
| // that should trigger an error, and one with valid constraints. The test
|
| // verifies getUserMedia can succeed after being given impossible constraints.
|
|
|