| 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/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.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 #include "media/base/media_switches.h" | 9 #include "media/base/media_switches.h" |
| 10 #include "media/base/test_data_util.h" | 10 #include "media/base/test_data_util.h" |
| 11 #include "media/mojo/features.h" |
| 11 | 12 |
| 12 #if defined(OS_ANDROID) | 13 #if defined(OS_ANDROID) |
| 13 #include "base/android/build_info.h" | 14 #include "base/android/build_info.h" |
| 14 #include "base/sys_info.h" | 15 #include "base/sys_info.h" |
| 15 #endif | 16 #endif |
| 16 | 17 |
| 17 #if defined(ENABLE_MOJO_RENDERER) | 18 #if BUILDFLAG(ENABLE_MOJO_RENDERER) |
| 18 // Remote mojo renderer does not send audio/video frames back to the renderer | 19 // Remote mojo renderer does not send audio/video frames back to the renderer |
| 19 // process and hence does not support capture: https://crbug.com/641559. | 20 // process and hence does not support capture: https://crbug.com/641559. |
| 20 #define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement | 21 #define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement |
| 21 #else | 22 #else |
| 22 #define MAYBE_CaptureFromMediaElement CaptureFromMediaElement | 23 #define MAYBE_CaptureFromMediaElement CaptureFromMediaElement |
| 23 #endif | 24 #endif |
| 24 | 25 |
| 25 namespace { | 26 namespace { |
| 26 | 27 |
| 27 static const char kCanvasCaptureTestHtmlFile[] = "/media/canvas_capture.html"; | 28 static const char kCanvasCaptureTestHtmlFile[] = "/media/canvas_capture.html"; |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 GetParam().has_video, | 131 GetParam().has_video, |
| 131 GetParam().has_audio, | 132 GetParam().has_audio, |
| 132 GetParam().use_audio_tag), | 133 GetParam().use_audio_tag), |
| 133 kVideoAudioHtmlFile); | 134 kVideoAudioHtmlFile); |
| 134 } | 135 } |
| 135 | 136 |
| 136 INSTANTIATE_TEST_CASE_P(, | 137 INSTANTIATE_TEST_CASE_P(, |
| 137 WebRtcCaptureFromElementBrowserTest, | 138 WebRtcCaptureFromElementBrowserTest, |
| 138 testing::ValuesIn(kFileAndTypeParameters)); | 139 testing::ValuesIn(kFileAndTypeParameters)); |
| 139 } // namespace content | 140 } // namespace content |
| OLD | NEW |