| OLD | NEW |
| 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/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/threading/platform_thread.h" | 8 #include "base/threading/platform_thread.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #elif defined(OS_ANDROID) && defined(__aarch64__) | 36 #elif defined(OS_ANDROID) && defined(__aarch64__) |
| 37 // Failures on ARM64 Android: http://crbug.com/408179. | 37 // Failures on ARM64 Android: http://crbug.com/408179. |
| 38 #define MAYBE_WebRtcBrowserTest DISABLED_WebRtcBrowserTest | 38 #define MAYBE_WebRtcBrowserTest DISABLED_WebRtcBrowserTest |
| 39 #else | 39 #else |
| 40 #define MAYBE_WebRtcBrowserTest WebRtcBrowserTest | 40 #define MAYBE_WebRtcBrowserTest WebRtcBrowserTest |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 class MAYBE_WebRtcBrowserTest : public WebRtcContentBrowserTest { | 43 class MAYBE_WebRtcBrowserTest : public WebRtcContentBrowserTest { |
| 44 public: | 44 public: |
| 45 MAYBE_WebRtcBrowserTest() {} | 45 MAYBE_WebRtcBrowserTest() {} |
| 46 virtual ~MAYBE_WebRtcBrowserTest() {} | 46 ~MAYBE_WebRtcBrowserTest() override {} |
| 47 | 47 |
| 48 // Convenience function since most peerconnection-call.html tests just load | 48 // Convenience function since most peerconnection-call.html tests just load |
| 49 // the page, kick off some javascript and wait for the title to change to OK. | 49 // the page, kick off some javascript and wait for the title to change to OK. |
| 50 void MakeTypicalPeerConnectionCall(const std::string& javascript) { | 50 void MakeTypicalPeerConnectionCall(const std::string& javascript) { |
| 51 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 51 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| 52 | 52 |
| 53 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 53 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
| 54 NavigateToURL(shell(), url); | 54 NavigateToURL(shell(), url); |
| 55 | 55 |
| 56 DisableOpusIfOnAndroid(); | 56 DisableOpusIfOnAndroid(); |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 | 434 |
| 435 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { | 435 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { |
| 436 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); | 436 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); |
| 437 } | 437 } |
| 438 | 438 |
| 439 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 439 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
| 440 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 440 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
| 441 } | 441 } |
| 442 | 442 |
| 443 } // namespace content | 443 } // namespace content |
| OLD | NEW |