| 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/test_data_util.h" | 9 #include "media/base/test_data_util.h" |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 }; | 28 }; |
| 29 | 29 |
| 30 } // namespace | 30 } // namespace |
| 31 | 31 |
| 32 namespace content { | 32 namespace content { |
| 33 | 33 |
| 34 // This class is the browser tests for Media Capture from DOM Elements API, | 34 // This class is the browser tests for Media Capture from DOM Elements API, |
| 35 // which allows for creation of a MediaStream out of a <canvas>, <video> or | 35 // which allows for creation of a MediaStream out of a <canvas>, <video> or |
| 36 // <audio> element. | 36 // <audio> element. |
| 37 class WebRtcCaptureFromElementBrowserTest | 37 class WebRtcCaptureFromElementBrowserTest |
| 38 : public WebRtcContentBrowserTest, | 38 : public WebRtcContentBrowserTestBase, |
| 39 public testing::WithParamInterface<struct FileAndTypeParameters> { | 39 public testing::WithParamInterface<struct FileAndTypeParameters> { |
| 40 public: | 40 public: |
| 41 WebRtcCaptureFromElementBrowserTest() {} | 41 WebRtcCaptureFromElementBrowserTest() {} |
| 42 ~WebRtcCaptureFromElementBrowserTest() override {} | 42 ~WebRtcCaptureFromElementBrowserTest() override {} |
| 43 | 43 |
| 44 void SetUpCommandLine(base::CommandLine* command_line) override { | 44 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 45 WebRtcContentBrowserTest::SetUpCommandLine(command_line); | 45 WebRtcContentBrowserTestBase::SetUpCommandLine(command_line); |
| 46 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 46 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 47 switches::kEnableBlinkFeatures, "MediaCaptureFromVideo"); | 47 switches::kEnableBlinkFeatures, "MediaCaptureFromVideo"); |
| 48 | 48 |
| 49 // Allow <video>/<audio>.play() when not initiated by user gesture. | 49 // Allow <video>/<audio>.play() when not initiated by user gesture. |
| 50 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 50 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 51 switches::kDisableGestureRequirementForMediaPlayback); | 51 switches::kDisableGestureRequirementForMediaPlayback); |
| 52 } | 52 } |
| 53 | 53 |
| 54 private: | 54 private: |
| 55 DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest); | 55 DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 68 GetParam().has_video, | 68 GetParam().has_video, |
| 69 GetParam().has_audio, | 69 GetParam().has_audio, |
| 70 GetParam().use_audio_tag), | 70 GetParam().use_audio_tag), |
| 71 kVideoAudioHtmlFile); | 71 kVideoAudioHtmlFile); |
| 72 } | 72 } |
| 73 | 73 |
| 74 INSTANTIATE_TEST_CASE_P(, | 74 INSTANTIATE_TEST_CASE_P(, |
| 75 WebRtcCaptureFromElementBrowserTest, | 75 WebRtcCaptureFromElementBrowserTest, |
| 76 testing::ValuesIn(kFileAndTypeParameters)); | 76 testing::ValuesIn(kFileAndTypeParameters)); |
| 77 } // namespace content | 77 } // namespace content |
| OLD | NEW |