| OLD | NEW |
| 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/files/file_util.h" | 6 #include "base/files/file_util.h" |
| 7 #include "base/threading/platform_thread.h" | 7 #include "base/threading/platform_thread.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/browser/media/webrtc/webrtc_content_browsertest_base.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/public/common/content_switches.h" | 11 #include "content/public/common/content_switches.h" |
| 11 #include "content/public/common/webrtc_ip_handling_policy.h" | 12 #include "content/public/common/webrtc_ip_handling_policy.h" |
| 12 #include "content/public/test/browser_test_utils.h" | 13 #include "content/public/test/browser_test_utils.h" |
| 13 #include "content/public/test/content_browser_test_utils.h" | 14 #include "content/public/test/content_browser_test_utils.h" |
| 14 #include "content/public/test/test_utils.h" | 15 #include "content/public/test/test_utils.h" |
| 15 #include "content/test/webrtc_content_browsertest_base.h" | |
| 16 #include "media/audio/audio_manager.h" | 16 #include "media/audio/audio_manager.h" |
| 17 #include "media/base/media_switches.h" | 17 #include "media/base/media_switches.h" |
| 18 #include "net/test/embedded_test_server/embedded_test_server.h" | 18 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 19 | 19 |
| 20 namespace content { | 20 namespace content { |
| 21 | 21 |
| 22 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) | 22 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) |
| 23 // Renderer crashes under Android ASAN: https://crbug.com/408496. | 23 // Renderer crashes under Android ASAN: https://crbug.com/408496. |
| 24 #define MAYBE_WebRtcBrowserAudioTest DISABLED_WebRtcBrowserAudioTest | 24 #define MAYBE_WebRtcBrowserAudioTest DISABLED_WebRtcBrowserAudioTest |
| 25 #else | 25 #else |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 "callAndEnsureRemoteVideoMutingDoesntMuteAudio();"); | 110 "callAndEnsureRemoteVideoMutingDoesntMuteAudio();"); |
| 111 } | 111 } |
| 112 | 112 |
| 113 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest, | 113 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserAudioTest, |
| 114 EstablishAudioVideoCallAndVerifyUnmutingWorks) { | 114 EstablishAudioVideoCallAndVerifyUnmutingWorks) { |
| 115 MakeAudioDetectingPeerConnectionCall( | 115 MakeAudioDetectingPeerConnectionCall( |
| 116 "callAndEnsureAudioTrackUnmutingWorks();"); | 116 "callAndEnsureAudioTrackUnmutingWorks();"); |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace content | 119 } // namespace content |
| OLD | NEW |