| 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/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "content/browser/media/webrtc_internals.h" | 8 #include "content/browser/media/webrtc_internals.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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 #define MAYBE_CanForwardRemoteStream CanForwardRemoteStream | 119 #define MAYBE_CanForwardRemoteStream CanForwardRemoteStream |
| 120 #define MAYBE_CanForwardRemoteStream720p CanForwardRemoteStream720p | 120 #define MAYBE_CanForwardRemoteStream720p CanForwardRemoteStream720p |
| 121 #endif | 121 #endif |
| 122 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanForwardRemoteStream) { | 122 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanForwardRemoteStream) { |
| 123 MakeTypicalPeerConnectionCall( | 123 MakeTypicalPeerConnectionCall( |
| 124 "callAndForwardRemoteStream({video: true, audio: false});"); | 124 "callAndForwardRemoteStream({video: true, audio: false});"); |
| 125 } | 125 } |
| 126 | 126 |
| 127 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanForwardRemoteStream720p) { | 127 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanForwardRemoteStream720p) { |
| 128 const std::string javascript = GenerateGetUserMediaCall( | 128 const std::string javascript = GenerateGetUserMediaCall( |
| 129 "callAndForwardRemoteStream", 1280, 1280, 720, 720, 30, 30); | 129 "callAndForwardRemoteStream", 1280, 1280, 720, 720, 10, 30); |
| 130 MakeTypicalPeerConnectionCall(javascript); | 130 MakeTypicalPeerConnectionCall(javascript); |
| 131 } | 131 } |
| 132 | 132 |
| 133 // This test will make a complete PeerConnection-based call but remove the | 133 // This test will make a complete PeerConnection-based call but remove the |
| 134 // MSID and bundle attribute from the initial offer to verify that | 134 // MSID and bundle attribute from the initial offer to verify that |
| 135 // video is playing for the call even if the initiating client don't support | 135 // video is playing for the call even if the initiating client don't support |
| 136 // MSID. http://tools.ietf.org/html/draft-alvestrand-rtcweb-msid-02 | 136 // MSID. http://tools.ietf.org/html/draft-alvestrand-rtcweb-msid-02 |
| 137 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 137 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
| 138 // Timing out on ARM linux, see http://crbug.com/240373 | 138 // Timing out on ARM linux, see http://crbug.com/240373 |
| 139 #define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle\ | 139 #define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle\ |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 | 404 |
| 405 EXPECT_TRUE(base::PathExists(dump_file)); | 405 EXPECT_TRUE(base::PathExists(dump_file)); |
| 406 int64 file_size = 0; | 406 int64 file_size = 0; |
| 407 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); | 407 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); |
| 408 EXPECT_EQ(0, file_size); | 408 EXPECT_EQ(0, file_size); |
| 409 | 409 |
| 410 base::DeleteFile(dump_file, false); | 410 base::DeleteFile(dump_file, false); |
| 411 } | 411 } |
| 412 | 412 |
| 413 } // namespace content | 413 } // namespace content |
| OLD | NEW |