Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

Issue 163243002: Disable Mac AVFoundation for WebRTC browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/media/chrome_webrtc_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/path_service.h" 6 #include "base/path_service.h"
7 #include "base/process/launch.h" 7 #include "base/process/launch.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 : dev_appserver_(base::kNullProcessHandle), 48 : dev_appserver_(base::kNullProcessHandle),
49 firefox_(base::kNullProcessHandle) { 49 firefox_(base::kNullProcessHandle) {
50 } 50 }
51 51
52 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 52 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
53 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream)); 53 EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
54 54
55 // The video playback will not work without a GPU, so force its use here. 55 // The video playback will not work without a GPU, so force its use here.
56 command_line->AppendSwitch(switches::kUseGpuInTests); 56 command_line->AppendSwitch(switches::kUseGpuInTests);
57 57
58 #if defined(OS_MACOSX)
59 // TODO(mcasas): Remove this switch when ManyCam virtual video capture
60 // device starts supporting AVFoundation, see http://crbug.com/327618.
61 command_line->AppendSwitch(switches::kDisableAVFoundation);
62 #endif
63
58 CommandLine::ForCurrentProcess()->AppendSwitch( 64 CommandLine::ForCurrentProcess()->AppendSwitch(
59 switches::kUseFakeDeviceForMediaStream); 65 switches::kUseFakeDeviceForMediaStream);
60 } 66 }
61 67
62 virtual void TearDown() OVERRIDE { 68 virtual void TearDown() OVERRIDE {
63 // Kill any processes we may have brought up. 69 // Kill any processes we may have brought up.
64 if (dev_appserver_ != base::kNullProcessHandle) 70 if (dev_appserver_ != base::kNullProcessHandle)
65 base::KillProcess(dev_appserver_, 0, false); 71 base::KillProcess(dev_appserver_, 0, false);
66 // TODO(phoglund): Find some way to shut down Firefox cleanly on Windows. 72 // TODO(phoglund): Find some way to shut down Firefox cleanly on Windows.
67 if (firefox_ != base::kNullProcessHandle) 73 if (firefox_ != base::kNullProcessHandle)
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 base::RandInt(0, 65536))); 250 base::RandInt(0, 65536)));
245 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); 251 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
246 252
247 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); 253 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
248 254
249 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); 255 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
250 256
251 // Ensure Firefox manages to send video our way. 257 // Ensure Firefox manages to send video our way.
252 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); 258 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
253 } 259 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/chrome_webrtc_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698