Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(624)

Unified Diff: content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc

Issue 2193343002: Cleanup: move content/browser/media/webrtc/ to content/browser/webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
diff --git a/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
deleted file mode 100644
index e08a2aae3f9e7fc4049b51936c305f93ed07f982..0000000000000000000000000000000000000000
--- a/content/browser/media/webrtc/webrtc_media_recorder_browsertest.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/command_line.h"
-#include "base/macros.h"
-#include "base/strings/stringprintf.h"
-#include "build/build_config.h"
-#include "content/browser/media/webrtc/webrtc_content_browsertest_base.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/content_browser_test_utils.h"
-#include "media/base/media_switches.h"
-
-namespace {
-
-static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html";
-
-static struct EncodingParameters {
- bool disable_accelerator;
- std::string video_codec;
-} const kEncodingParameters[] = {
- {true, "VP8"}, {true, "VP9"}, {true, "H264"},
- {false, "VP8"}, {false, "VP9"}, {false, "H264"},
-};
-
-} // namespace
-
-namespace content {
-
-// This class tests the recording of a media stream.
-class WebRtcMediaRecorderTest
- : public WebRtcContentBrowserTest,
- public testing::WithParamInterface<struct EncodingParameters> {
- public:
- WebRtcMediaRecorderTest() {}
- ~WebRtcMediaRecorderTest() override {}
-
- void SetUpCommandLine(base::CommandLine* command_line) override {
- WebRtcContentBrowserTest::SetUpCommandLine(command_line);
-
- AppendUseFakeUIForMediaStreamFlag();
-
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kUseFakeDeviceForMediaStream);
-
- base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kEnableBlinkFeatures, "GetUserMedia");
- }
-
- void MaybeForceDisableEncodeAccelerator(bool disable) {
- if (!disable)
- return;
- // This flag is also used for encoding, https://crbug.com/616640.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedVideoDecode);
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebRtcMediaRecorderTest);
-};
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStart) {
- MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStartAndStop) {
- MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest,
- MediaRecorderStartAndDataAvailable) {
- MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
- MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");",
- GetParam().video_codec.c_str()),
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest,
- MediaRecorderStartWithTimeSlice) {
- MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
- MakeTypicalCall(base::StringPrintf("testStartWithTimeSlice(\"%s\");",
- GetParam().video_codec.c_str()),
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderResume) {
- MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderNoResumeWhenRecorderInactive) {
- MakeTypicalCall("testIllegalResumeThrowsDOMError();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest,
- MediaRecorderResumeAndDataAvailable) {
- MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
- MakeTypicalCall(base::StringPrintf("testResumeAndDataAvailable(\"%s\");",
- GetParam().video_codec.c_str()),
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPause) {
- MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPauseStop) {
- MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderPausePreventsDataavailableFromBeingFired) {
- MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();",
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderIllegalPauseThrowsDOMError) {
- MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderTwoChannelAudioRecording) {
- MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderIllegalStopThrowsDOMError) {
- MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderIllegalStartWhileRecordingThrowsDOMError) {
- MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderIllegalStartWhilePausedThrowsDOMError) {
- MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();",
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- MediaRecorderIllegalRequestDataThrowsDOMError) {
- MakeTypicalCall("testIllegalRequestDataThrowsDOMError();",
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) {
- MakeTypicalCall("testRecordRemotePeerConnection();", kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- AddingTrackToMediaStreamFiresErrorEvent) {
- MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();",
- kMediaRecorderHtmlFile);
-}
-
-IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
- RemovingTrackFromMediaStreamFiresErrorEvent) {
- MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
- kMediaRecorderHtmlFile);
-}
-
-INSTANTIATE_TEST_CASE_P(,
- WebRtcMediaRecorderTest,
- testing::ValuesIn(kEncodingParameters));
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698