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

Unified Diff: content/browser/media/webrtc/webrtc_browsertest_data.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_browsertest_data.cc
diff --git a/content/browser/media/webrtc/webrtc_browsertest_data.cc b/content/browser/media/webrtc/webrtc_browsertest_data.cc
deleted file mode 100644
index ee4841ff9ee8affa928211d09370d9a5f5a7399b..0000000000000000000000000000000000000000
--- a/content/browser/media/webrtc/webrtc_browsertest_data.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2016 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/files/file_util.h"
-#include "base/threading/platform_thread.h"
-#include "build/build_config.h"
-#include "content/browser/media/webrtc/webrtc_content_browsertest_base.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/common/webrtc_ip_handling_policy.h"
-#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/content_browser_test_utils.h"
-#include "content/public/test/test_utils.h"
-#include "media/audio/audio_manager.h"
-#include "media/base/media_switches.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
-
-namespace content {
-
-#if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
-// Renderer crashes under Android ASAN: https://crbug.com/408496.
-#define MAYBE_WebRtcBrowserDataTest DISABLED_WebRtcBrowserDataTest
-#else
-#define MAYBE_WebRtcBrowserDataTest WebRtcBrowserDataTest
-#endif
-
-// This class tests the scenario when permission to access mic or camera is
-// granted.
-class MAYBE_WebRtcBrowserDataTest : public WebRtcContentBrowserTest {
- public:
- MAYBE_WebRtcBrowserDataTest() {}
- ~MAYBE_WebRtcBrowserDataTest() override {}
-
- void SetUpCommandLine(base::CommandLine* command_line) override {
- WebRtcContentBrowserTest::SetUpCommandLine(command_line);
- // Automatically grant device permission.
- AppendUseFakeUIForMediaStreamFlag();
- }
-
- protected:
- // Convenience function since most peerconnection-call.html tests just load
- // the page, kick off some javascript and wait for the title to change to OK.
- void MakeTypicalPeerConnectionCall(const std::string& javascript) {
- MakeTypicalCall(javascript, "/media/peerconnection-call-data.html");
- }
-};
-
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserDataTest, CanSetupLegacyCall) {
- MakeTypicalPeerConnectionCall("callWithLegacySdp();");
-}
-
-// This test will make a PeerConnection-based call and test an unreliable text
-// dataChannel.
-// TODO(mallinath) - Remove this test after rtp based data channel is disabled.
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserDataTest, CallWithDataOnly) {
- MakeTypicalPeerConnectionCall("callWithDataOnly();");
-}
-
-#if defined(MEMORY_SANITIZER)
-// Fails under MemorySanitizer: http://crbug.com/405951
-#define MAYBE_CallWithSctpDataOnly DISABLED_CallWithSctpDataOnly
-#else
-#define MAYBE_CallWithSctpDataOnly CallWithSctpDataOnly
-#endif
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserDataTest,
- MAYBE_CallWithSctpDataOnly) {
- MakeTypicalPeerConnectionCall("callWithSctpDataOnly();");
-}
-
-// This test will make a PeerConnection-based call and test an unreliable text
-// dataChannel and audio and video tracks.
-// TODO(mallinath) - Remove this test after rtp based data channel is disabled.
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserDataTest, CallWithDataAndMedia) {
- MakeTypicalPeerConnectionCall("callWithDataAndMedia();");
-}
-
-
-#if defined(MEMORY_SANITIZER)
-// Fails under MemorySanitizer: http://crbug.com/405951
-#define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia
-#else
-#define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia
-#endif
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserDataTest,
- MAYBE_CallWithSctpDataAndMedia) {
- MakeTypicalPeerConnectionCall("callWithSctpDataAndMedia();");
-}
-
-// This test will make a PeerConnection-based call and test an unreliable text
-// dataChannel and later add an audio and video track.
-// Doesn't work, therefore disabled: https://crbug.com/293252.
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserDataTest,
- DISABLED_CallWithDataAndLaterAddMedia) {
- MakeTypicalPeerConnectionCall("callWithDataAndLaterAddMedia();");
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698