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

Unified Diff: content/browser/media/webrtc/webrtc_datachannel_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_datachannel_browsertest.cc
diff --git a/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc b/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc
deleted file mode 100644
index 93c7e085be613a2f09710933b1a56c739a2c0332..0000000000000000000000000000000000000000
--- a/content/browser/media/webrtc/webrtc_datachannel_browsertest.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 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/macros.h"
-#include "content/browser/media/webrtc/webrtc_content_browsertest_base.h"
-#include "content/public/common/content_switches.h"
-
-namespace {
-
-const char kJavaScriptFeaturesNeeded[] = "--expose-gc";
-const char kDataChannelHtmlFile[] = "/media/datachannel_test.html";
-
-} // namespace
-
-namespace content {
-
-#if defined(OS_WIN) || (defined(OS_ANDROID) && defined(ADDRESS_SANITIZER))
-// GC does not work correctly in some cases under Android ASAN.
-// See https://crbug.com/611620.
-// This test has become flaky on Windows. See https://crbug.com/616388
-#define MAYBE_WebRtcDataChannelTest DISABLED_WebRtcDataChannelTest
-#else
-#define MAYBE_WebRtcDataChannelTest WebRtcDataChannelTest
-#endif
-
-class MAYBE_WebRtcDataChannelTest : public WebRtcContentBrowserTest {
- public:
- MAYBE_WebRtcDataChannelTest() {}
- ~MAYBE_WebRtcDataChannelTest() override {}
-
- void SetUpCommandLine(base::CommandLine* command_line) override {
- WebRtcContentBrowserTest::SetUpCommandLine(command_line);
- AppendUseFakeUIForMediaStreamFlag();
- base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kJavaScriptFlags, kJavaScriptFeaturesNeeded);
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcDataChannelTest);
-};
-
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataChannelTest, DataChannelGC) {
- MakeTypicalCall("testDataChannelGC();", kDataChannelHtmlFile);
-}
-
-} // namespace content
« no previous file with comments | « content/browser/media/webrtc/webrtc_content_browsertest_base.cc ('k') | content/browser/media/webrtc/webrtc_eventlog_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698