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/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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 return false; | 176 return false; |
177 } | 177 } |
178 | 178 |
179 CommandLine command_line(firefox_launcher); | 179 CommandLine command_line(firefox_launcher); |
180 command_line.AppendSwitchPath("--binary", firefox_binary); | 180 command_line.AppendSwitchPath("--binary", firefox_binary); |
181 command_line.AppendSwitchASCII("--webpage", url.spec()); | 181 command_line.AppendSwitchASCII("--webpage", url.spec()); |
182 | 182 |
183 VLOG(1) << "Running " << command_line.GetCommandLineString(); | 183 VLOG(1) << "Running " << command_line.GetCommandLineString(); |
184 return base::LaunchProcess(command_line, base::LaunchOptions(), | 184 return base::LaunchProcess(command_line, base::LaunchOptions(), |
185 &firefox_); | 185 &firefox_); |
186 | |
187 return true; | |
188 } | 186 } |
189 | 187 |
190 private: | 188 private: |
191 base::ProcessHandle dev_appserver_; | 189 base::ProcessHandle dev_appserver_; |
192 base::ProcessHandle firefox_; | 190 base::ProcessHandle firefox_; |
193 }; | 191 }; |
194 | 192 |
195 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { | 193 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { |
196 // TODO(mcasas): Remove Win version filtering when this bug gets fixed: | 194 // TODO(mcasas): Remove Win version filtering when this bug gets fixed: |
197 // http://code.google.com/p/webrtc/issues/detail?id=2703 | 195 // http://code.google.com/p/webrtc/issues/detail?id=2703 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 base::RandInt(0, 65536))); | 241 base::RandInt(0, 65536))); |
244 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); | 242 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); |
245 | 243 |
246 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); | 244 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); |
247 | 245 |
248 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); | 246 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); |
249 | 247 |
250 // Ensure Firefox manages to send video our way. | 248 // Ensure Firefox manages to send video our way. |
251 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); | 249 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); |
252 } | 250 } |
OLD | NEW |