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

Side by Side Diff: content/browser/webrtc/webrtc_datachannel_browsertest.cc

Issue 2205423002: webrtc content_browsetests file/class naming cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
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/macros.h" 6 #include "base/macros.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 9
10 namespace { 10 namespace {
11 11
12 const char kJavaScriptFeaturesNeeded[] = "--expose-gc"; 12 const char kJavaScriptFeaturesNeeded[] = "--expose-gc";
13 const char kDataChannelHtmlFile[] = "/media/datachannel_test.html"; 13 const char kDataChannelHtmlFile[] = "/media/datachannel_test.html";
14 14
15 } // namespace 15 } // namespace
16 16
17 namespace content { 17 namespace content {
18 18
19 #if defined(OS_WIN) || (defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)) 19 #if defined(OS_WIN) || (defined(OS_ANDROID) && defined(ADDRESS_SANITIZER))
20 // GC does not work correctly in some cases under Android ASAN. 20 // GC does not work correctly in some cases under Android ASAN.
21 // See https://crbug.com/611620. 21 // See https://crbug.com/611620.
22 // This test has become flaky on Windows. See https://crbug.com/616388 22 // This test has become flaky on Windows. See https://crbug.com/616388
23 #define MAYBE_WebRtcDataChannelTest DISABLED_WebRtcDataChannelTest 23 #define MAYBE_WebRtcDataChannelTest DISABLED_WebRtcDataChannelTest
24 #else 24 #else
25 #define MAYBE_WebRtcDataChannelTest WebRtcDataChannelTest 25 #define MAYBE_WebRtcDataChannelTest WebRtcDataChannelTest
26 #endif 26 #endif
27 27
28 class MAYBE_WebRtcDataChannelTest : public WebRtcContentBrowserTest { 28 class MAYBE_WebRtcDataChannelTest : public WebRtcContentBrowserTestBase {
29 public: 29 public:
30 MAYBE_WebRtcDataChannelTest() {} 30 MAYBE_WebRtcDataChannelTest() {}
31 ~MAYBE_WebRtcDataChannelTest() override {} 31 ~MAYBE_WebRtcDataChannelTest() override {}
32 32
33 void SetUpCommandLine(base::CommandLine* command_line) override { 33 void SetUpCommandLine(base::CommandLine* command_line) override {
34 WebRtcContentBrowserTest::SetUpCommandLine(command_line); 34 WebRtcContentBrowserTestBase::SetUpCommandLine(command_line);
35 AppendUseFakeUIForMediaStreamFlag(); 35 AppendUseFakeUIForMediaStreamFlag();
36 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( 36 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
37 switches::kJavaScriptFlags, kJavaScriptFeaturesNeeded); 37 switches::kJavaScriptFlags, kJavaScriptFeaturesNeeded);
38 } 38 }
39 39
40 private: 40 private:
41 DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcDataChannelTest); 41 DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcDataChannelTest);
42 }; 42 };
43 43
44 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataChannelTest, DataChannelGC) { 44 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataChannelTest, DataChannelGC) {
45 MakeTypicalCall("testDataChannelGC();", kDataChannelHtmlFile); 45 MakeTypicalCall("testDataChannelGC();", kDataChannelHtmlFile);
46 } 46 }
47 47
48 } // namespace content 48 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/webrtc/webrtc_data_browsertest.cc ('k') | content/browser/webrtc/webrtc_getusermedia_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698