| 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/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" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 void SetUpCommandLine(base::CommandLine* command_line) override { | 39 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 40 WebRtcContentBrowserTest::SetUpCommandLine(command_line); | 40 WebRtcContentBrowserTest::SetUpCommandLine(command_line); |
| 41 // Automatically grant device permission. | 41 // Automatically grant device permission. |
| 42 AppendUseFakeUIForMediaStreamFlag(); | 42 AppendUseFakeUIForMediaStreamFlag(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 protected: | 45 protected: |
| 46 // Convenience function since most peerconnection-call.html tests just load | 46 // Convenience function since most peerconnection-call.html tests just load |
| 47 // the page, kick off some javascript and wait for the title to change to OK. | 47 // the page, kick off some javascript and wait for the title to change to OK. |
| 48 void MakeTypicalPeerConnectionCall(const std::string& javascript) { | 48 void MakeTypicalPeerConnectionCall(const std::string& javascript) { |
| 49 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 49 ASSERT_TRUE(embedded_test_server()->Start()); |
| 50 | 50 |
| 51 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 51 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
| 52 NavigateToURL(shell(), url); | 52 NavigateToURL(shell(), url); |
| 53 | 53 |
| 54 ExecuteJavascriptAndWaitForOk(javascript); | 54 ExecuteJavascriptAndWaitForOk(javascript); |
| 55 } | 55 } |
| 56 | 56 |
| 57 // Convenience method for making calls that detect if audio os playing (which | 57 // Convenience method for making calls that detect if audio os playing (which |
| 58 // has some special prerequisites, such that there needs to be an audio output | 58 // has some special prerequisites, such that there needs to be an audio output |
| 59 // device on the executing machine). | 59 // device on the executing machine). |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 // gathered. | 391 // gathered. |
| 392 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserMultipleRoutesDisabledTest, | 392 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserMultipleRoutesDisabledTest, |
| 393 GatherLocalCandidatesWithIceServersUndefined) { | 393 GatherLocalCandidatesWithIceServersUndefined) { |
| 394 // Disable this test on XP, crbug.com/542416. | 394 // Disable this test on XP, crbug.com/542416. |
| 395 if (OnWinXp()) return; | 395 if (OnWinXp()) return; |
| 396 MakeTypicalPeerConnectionCall( | 396 MakeTypicalPeerConnectionCall( |
| 397 "callWithMultipleRoutesDisabledAndUndefinedIceServers();"); | 397 "callWithMultipleRoutesDisabledAndUndefinedIceServers();"); |
| 398 } | 398 } |
| 399 | 399 |
| 400 } // namespace content | 400 } // namespace content |
| OLD | NEW |