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

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 1417023003: Disable test and remove the reference of enable_localhost_ice_candidate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test cases with certificates Created 5 years, 1 month 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
« no previous file with comments | « no previous file | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/threading/platform_thread.h" 7 #include "base/threading/platform_thread.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "content/public/test/content_browser_test_utils.h" 11 #include "content/public/test/content_browser_test_utils.h"
12 #include "content/public/test/test_utils.h" 12 #include "content/public/test/test_utils.h"
13 #include "content/test/webrtc_content_browsertest_base.h" 13 #include "content/test/webrtc_content_browsertest_base.h"
14 #include "media/audio/audio_manager.h" 14 #include "media/audio/audio_manager.h"
15 #include "media/base/media_switches.h" 15 #include "media/base/media_switches.h"
16 #include "net/test/embedded_test_server/embedded_test_server.h" 16 #include "net/test/embedded_test_server/embedded_test_server.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 #define MAYBE_WebRtcBrowserPermissionDeniedTest \
21 DISABLED_WebRtcBrowserPermissionDeniedTest
22 #define MAYBE_WebRtcBrowserMultipleRoutesDisabledTest \
23 DISABLED_WebRtcBrowserMultipleRoutesDisabledTest
24
20 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) 25 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
21 // Renderer crashes under Android ASAN: https://crbug.com/408496. 26 // Renderer crashes under Android ASAN: https://crbug.com/408496.
22 #define MAYBE_WebRtcBrowserTest DISABLED_WebRtcBrowserTest 27 #define MAYBE_WebRtcBrowserTest DISABLED_WebRtcBrowserTest
23 #define MAYBE_WebRtcBrowserPermissionDeniedTest \
24 DISABLED_WebRtcBrowserPermissionDeniedTest
25 #define MAYBE_WebRtcBrowserMultipleRoutesDisabledTest \
26 DISABLED_WebRtcBrowserMultipleRoutesDisabledTest
27 #else 28 #else
28 #define MAYBE_WebRtcBrowserTest WebRtcBrowserTest 29 #define MAYBE_WebRtcBrowserTest WebRtcBrowserTest
29 #define MAYBE_WebRtcBrowserPermissionDeniedTest \
30 WebRtcBrowserPermissionDeniedTest
31 #define MAYBE_WebRtcBrowserMultipleRoutesDisabledTest \
32 WebRtcBrowserMultipleRoutesDisabledTest
33 #endif 30 #endif
34 31
35 // This class tests the scenario when permission to access mic or camera is 32 // This class tests the scenario when permission to access mic or camera is
36 // granted. 33 // granted.
37 class MAYBE_WebRtcBrowserTest : public WebRtcContentBrowserTest { 34 class MAYBE_WebRtcBrowserTest : public WebRtcContentBrowserTest {
38 public: 35 public:
39 MAYBE_WebRtcBrowserTest() {} 36 MAYBE_WebRtcBrowserTest() {}
40 ~MAYBE_WebRtcBrowserTest() override {} 37 ~MAYBE_WebRtcBrowserTest() override {}
41 38
42 void SetUpCommandLine(base::CommandLine* command_line) override { 39 void SetUpCommandLine(base::CommandLine* command_line) override {
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 // gathered. 391 // gathered.
395 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserMultipleRoutesDisabledTest, 392 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserMultipleRoutesDisabledTest,
396 GatherLocalCandidatesWithIceServersUndefined) { 393 GatherLocalCandidatesWithIceServersUndefined) {
397 // Disable this test on XP, crbug.com/542416. 394 // Disable this test on XP, crbug.com/542416.
398 if (OnWinXp()) return; 395 if (OnWinXp()) return;
399 MakeTypicalPeerConnectionCall( 396 MakeTypicalPeerConnectionCall(
400 "callWithMultipleRoutesDisabledAndUndefinedIceServers();"); 397 "callWithMultipleRoutesDisabledAndUndefinedIceServers();");
401 } 398 }
402 399
403 } // namespace content 400 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698