OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/process/launch.h" | 10 #include "base/process/launch.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 } | 46 } |
47 | 47 |
48 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 48 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
49 // This test expects real device handling and requires a real webcam / audio | 49 // This test expects real device handling and requires a real webcam / audio |
50 // device; it will not work with fake devices. | 50 // device; it will not work with fake devices. |
51 EXPECT_FALSE(command_line->HasSwitch( | 51 EXPECT_FALSE(command_line->HasSwitch( |
52 switches::kUseFakeDeviceForMediaStream)); | 52 switches::kUseFakeDeviceForMediaStream)); |
53 EXPECT_FALSE(command_line->HasSwitch( | 53 EXPECT_FALSE(command_line->HasSwitch( |
54 switches::kUseFakeUIForMediaStream)); | 54 switches::kUseFakeUIForMediaStream)); |
55 | 55 |
| 56 #if defined(OS_MACOSX) |
| 57 // TODO(mcasas): Remove this switch when ManyCam virtual video capture |
| 58 // device starts supporting AVFoundation, see http://crbug.com/327618. |
| 59 command_line->AppendSwitch(switches::kDisableAVFoundation); |
| 60 #endif |
| 61 |
56 // Flag used by TestWebAudioMediaStream to force garbage collection. | 62 // Flag used by TestWebAudioMediaStream to force garbage collection. |
57 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); | 63 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); |
58 } | 64 } |
59 | 65 |
60 void EstablishCall(content::WebContents* from_tab, | 66 void EstablishCall(content::WebContents* from_tab, |
61 content::WebContents* to_tab) { | 67 content::WebContents* to_tab) { |
62 ConnectToPeerConnectionServer("peer 1", from_tab); | 68 ConnectToPeerConnectionServer("peer 1", from_tab); |
63 ConnectToPeerConnectionServer("peer 2", to_tab); | 69 ConnectToPeerConnectionServer("peer 2", to_tab); |
64 | 70 |
65 EXPECT_EQ("ok-peerconnection-created", | 71 EXPECT_EQ("ok-peerconnection-created", |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 272 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
267 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); | 273 GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); |
268 ui_test_utils::NavigateToURL(browser(), url); | 274 ui_test_utils::NavigateToURL(browser(), url); |
269 content::WebContents* tab = | 275 content::WebContents* tab = |
270 browser()->tab_strip_model()->GetActiveWebContents(); | 276 browser()->tab_strip_model()->GetActiveWebContents(); |
271 // A sleep is necessary to be able to detect the crash. | 277 // A sleep is necessary to be able to detect the crash. |
272 SleepInJavascript(tab, 1000); | 278 SleepInJavascript(tab, 1000); |
273 | 279 |
274 ASSERT_FALSE(tab->IsCrashed()); | 280 ASSERT_FALSE(tab->IsCrashed()); |
275 } | 281 } |
OLD | NEW |