| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/feature_list.h" | 8 #include "base/feature_list.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/memory/ref_counted_memory.h" | 10 #include "base/memory/ref_counted_memory.h" |
| (...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1363 | 1363 |
| 1364 std::string constraints_1_1 = GenerateGetUserMediaCall( | 1364 std::string constraints_1_1 = GenerateGetUserMediaCall( |
| 1365 kGetUserMediaAndAnalyseAndStop, 320, 320, 320, 320, 10, 30); | 1365 kGetUserMediaAndAnalyseAndStop, 320, 320, 320, 320, 10, 30); |
| 1366 | 1366 |
| 1367 NavigateToURL(shell(), url); | 1367 NavigateToURL(shell(), url); |
| 1368 ASSERT_EQ("w=320:h=320", ExecuteJavascriptAndReturnResult(constraints_1_1)); | 1368 ASSERT_EQ("w=320:h=320", ExecuteJavascriptAndReturnResult(constraints_1_1)); |
| 1369 } | 1369 } |
| 1370 | 1370 |
| 1371 // This test calls getUserMedia in an iframe and immediately close the iframe | 1371 // This test calls getUserMedia in an iframe and immediately close the iframe |
| 1372 // in the scope of the success callback. | 1372 // in the scope of the success callback. |
| 1373 // TODO(mattcary): disabled for flakes, see crbug.com/727601. |
| 1373 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest, | 1374 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest, |
| 1374 AudioInIFrameAndCloseInSuccessCb) { | 1375 DISABLED_AudioInIFrameAndCloseInSuccessCb) { |
| 1375 ASSERT_TRUE(embedded_test_server()->Start()); | 1376 ASSERT_TRUE(embedded_test_server()->Start()); |
| 1376 | 1377 |
| 1377 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); | 1378 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
| 1378 NavigateToURL(shell(), url); | 1379 NavigateToURL(shell(), url); |
| 1379 | 1380 |
| 1380 std::string call = "getUserMediaInIframeAndCloseInSuccessCb({audio: true});"; | 1381 std::string call = "getUserMediaInIframeAndCloseInSuccessCb({audio: true});"; |
| 1381 ExecuteJavascriptAndWaitForOk(call); | 1382 ExecuteJavascriptAndWaitForOk(call); |
| 1382 } | 1383 } |
| 1383 | 1384 |
| 1384 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest, | 1385 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest, |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1444 base::Bind(&VerifyDisableLocalEcho, true)); | 1445 base::Bind(&VerifyDisableLocalEcho, true)); |
| 1445 call = GenerateGetUserMediaWithDisableLocalEcho( | 1446 call = GenerateGetUserMediaWithDisableLocalEcho( |
| 1446 "getUserMediaAndExpectSuccess", "true"); | 1447 "getUserMediaAndExpectSuccess", "true"); |
| 1447 ExecuteJavascriptAndWaitForOk(call); | 1448 ExecuteJavascriptAndWaitForOk(call); |
| 1448 | 1449 |
| 1449 manager->SetGenerateStreamCallbackForTesting( | 1450 manager->SetGenerateStreamCallbackForTesting( |
| 1450 MediaStreamManager::GenerateStreamTestCallback()); | 1451 MediaStreamManager::GenerateStreamTestCallback()); |
| 1451 } | 1452 } |
| 1452 | 1453 |
| 1453 } // namespace content | 1454 } // namespace content |
| OLD | NEW |