| OLD | NEW |
| 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/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 "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" | 10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) | 22 #if defined(OS_ANDROID) && defined(ADDRESS_SANITIZER) |
| 23 // Renderer crashes under Android ASAN: https://crbug.com/408496. | 23 // Renderer crashes under Android ASAN: https://crbug.com/408496. |
| 24 #define MAYBE_WebRtcDataBrowserTest DISABLED_WebRtcDataBrowserTest | 24 #define MAYBE_WebRtcDataBrowserTest DISABLED_WebRtcDataBrowserTest |
| 25 #else | 25 #else |
| 26 #define MAYBE_WebRtcDataBrowserTest WebRtcDataBrowserTest | 26 #define MAYBE_WebRtcDataBrowserTest WebRtcDataBrowserTest |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 // This class tests the scenario when permission to access mic or camera is | 29 // This class tests the scenario when permission to access mic or camera is |
| 30 // granted. | 30 // granted. |
| 31 class MAYBE_WebRtcDataBrowserTest : public WebRtcContentBrowserTest { | 31 class MAYBE_WebRtcDataBrowserTest : public WebRtcContentBrowserTestBase { |
| 32 public: | 32 public: |
| 33 MAYBE_WebRtcDataBrowserTest() {} | 33 MAYBE_WebRtcDataBrowserTest() {} |
| 34 ~MAYBE_WebRtcDataBrowserTest() override {} | 34 ~MAYBE_WebRtcDataBrowserTest() override {} |
| 35 | 35 |
| 36 void SetUpCommandLine(base::CommandLine* command_line) override { | 36 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 37 WebRtcContentBrowserTest::SetUpCommandLine(command_line); | 37 WebRtcContentBrowserTestBase::SetUpCommandLine(command_line); |
| 38 // Automatically grant device permission. | 38 // Automatically grant device permission. |
| 39 AppendUseFakeUIForMediaStreamFlag(); | 39 AppendUseFakeUIForMediaStreamFlag(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 protected: | 42 protected: |
| 43 // Convenience function since most peerconnection-call.html tests just load | 43 // Convenience function since most peerconnection-call.html tests just load |
| 44 // the page, kick off some javascript and wait for the title to change to OK. | 44 // the page, kick off some javascript and wait for the title to change to OK. |
| 45 void MakeTypicalPeerConnectionCall(const std::string& javascript) { | 45 void MakeTypicalPeerConnectionCall(const std::string& javascript) { |
| 46 MakeTypicalCall(javascript, "/media/peerconnection-call-data.html"); | 46 MakeTypicalCall(javascript, "/media/peerconnection-call-data.html"); |
| 47 } | 47 } |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 | 90 |
| 91 // This test will make a PeerConnection-based call and test an unreliable text | 91 // This test will make a PeerConnection-based call and test an unreliable text |
| 92 // dataChannel and later add an audio and video track. | 92 // dataChannel and later add an audio and video track. |
| 93 // Doesn't work, therefore disabled: https://crbug.com/293252. | 93 // Doesn't work, therefore disabled: https://crbug.com/293252. |
| 94 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataBrowserTest, | 94 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataBrowserTest, |
| 95 DISABLED_CallWithDataAndLaterAddMedia) { | 95 DISABLED_CallWithDataAndLaterAddMedia) { |
| 96 MakeTypicalPeerConnectionCall("callWithDataAndLaterAddMedia();"); | 96 MakeTypicalPeerConnectionCall("callWithDataAndLaterAddMedia();"); |
| 97 } | 97 } |
| 98 | 98 |
| 99 } // namespace content | 99 } // namespace content |
| OLD | NEW |