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

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

Issue 908483003: Temporarily disabling AppRTC test on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« 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/files/file_enumerator.h" 6 #include "base/files/file_enumerator.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/process/launch.h" 8 #include "base/process/launch.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); 219 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions());
220 return firefox_.IsValid(); 220 return firefox_.IsValid();
221 } 221 }
222 222
223 private: 223 private:
224 base::Process dev_appserver_; 224 base::Process dev_appserver_;
225 base::Process firefox_; 225 base::Process firefox_;
226 base::Process collider_server_; 226 base::Process collider_server_;
227 }; 227 };
228 228
229 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { 229 #if defined(OS_WIN)
230 // Disabled due to https://github.com/webrtc/apprtc/issues/48.
231 #define MAYBE_MANUAL_WorksOnApprtc DISABLED_MANUAL_WorksOnApprtc
232 #else
233 #define MAYBE_MANUAL_WorksOnApprtc MANUAL_WorksOnApprtc
234 #endif
235
kjellander_chromium 2015/02/06 13:32:40 I usually skip a newline here.
236 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MAYBE_MANUAL_WorksOnApprtc) {
230 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. 237 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
231 if (OnWinXp()) 238 if (OnWinXp())
232 return; 239 return;
233 240
234 DetectErrorsInJavaScript(); 241 DetectErrorsInJavaScript();
235 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); 242 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
236 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); 243 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
237 while (!LocalApprtcInstanceIsUp()) 244 while (!LocalApprtcInstanceIsUp())
238 DVLOG(1) << "Waiting for AppRTC to come up..."; 245 DVLOG(1) << "Waiting for AppRTC to come up...";
239 246
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 "&firefox_fake_device=1"); 287 "&firefox_fake_device=1");
281 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); 288 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
282 289
283 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); 290 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
284 291
285 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); 292 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
286 293
287 // Ensure Firefox manages to send video our way. 294 // Ensure Firefox manages to send video our way.
288 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); 295 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
289 } 296 }
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