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 240783004: Disabling WebRtcApprtcBrowserTest.MANUAL_FirefoxApprtcInteropTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | no next file » | 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 content::WebContents* right_tab = OpenPageAndAcceptUserMedia(room_url); 210 content::WebContents* right_tab = OpenPageAndAcceptUserMedia(room_url);
211 211
212 ASSERT_TRUE(WaitForCallToComeUp(left_tab)); 212 ASSERT_TRUE(WaitForCallToComeUp(left_tab));
213 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); 213 ASSERT_TRUE(WaitForCallToComeUp(right_tab));
214 214
215 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); 215 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab));
216 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); 216 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab));
217 } 217 }
218 218
219 #if defined(OS_LINUX) 219 #if defined(OS_LINUX)
220 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest 220 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
Ami GONE FROM CHROMIUM 2014/04/17 16:41:56 Post-commit drive-by FYI It's always best to inclu
221 #else 221 #else
222 // Not implemented yet on Windows and Mac. 222 // Not implemented yet on Windows and Mac.
223 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest 223 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
224 #endif 224 #endif
225 225
226 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, 226 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
227 MAYBE_MANUAL_FirefoxApprtcInteropTest) { 227 MAYBE_MANUAL_FirefoxApprtcInteropTest) {
228 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. 228 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
229 #if defined(OS_WIN) 229 #if defined(OS_WIN)
230 if (base::win::GetVersion() < base::win::VERSION_VISTA) 230 if (base::win::GetVersion() < base::win::VERSION_VISTA)
231 return; 231 return;
232 #endif 232 #endif
233 233
234 DetectErrorsInJavaScript(); 234 DetectErrorsInJavaScript();
235 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost()); 235 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost());
236 while (!LocalApprtcInstanceIsUp()) 236 while (!LocalApprtcInstanceIsUp())
237 VLOG(1) << "Waiting for AppRTC to come up..."; 237 VLOG(1) << "Waiting for AppRTC to come up...";
238 238
239 GURL room_url = GURL(base::StringPrintf("http://localhost:9999?r=room_%d", 239 GURL room_url = GURL(base::StringPrintf("http://localhost:9999?r=room_%d",
240 base::RandInt(0, 65536))); 240 base::RandInt(0, 65536)));
241 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); 241 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
242 242
243 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); 243 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
244 244
245 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); 245 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
246 246
247 // Ensure Firefox manages to send video our way. 247 // Ensure Firefox manages to send video our way.
248 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); 248 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
249 } 249 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698