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

Side by Side Diff: chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc

Issue 2899103002: Revert of Disable flaky WebRtcInternalsPerfBrowserTest on Windows. (Closed)
Patch Set: Rebase. Created 3 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <memory> 5 #include <memory>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 IN_PROC_BROWSER_TEST_F( 234 IN_PROC_BROWSER_TEST_F(
235 WebRtcInternalsPerfBrowserTest, 235 WebRtcInternalsPerfBrowserTest,
236 MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9) { 236 MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9) {
237 base::ThreadRestrictions::ScopedAllowIO allow_io; 237 base::ThreadRestrictions::ScopedAllowIO allow_io;
238 RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP9"); 238 RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP9");
239 } 239 }
240 240
241 #if BUILDFLAG(RTC_USE_H264) 241 #if BUILDFLAG(RTC_USE_H264)
242 242
243 // Flaky on Windows, crbug.com/703579.
244 #if defined(OS_WIN)
245 #define MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264 \
246 DISABLED_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264
247 #else
248 #define MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264 \
249 MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264
250 #endif
251 IN_PROC_BROWSER_TEST_F( 243 IN_PROC_BROWSER_TEST_F(
252 WebRtcInternalsPerfBrowserTest, 244 WebRtcInternalsPerfBrowserTest,
253 MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264) { 245 MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264) {
254 base::ThreadRestrictions::ScopedAllowIO allow_io; 246 base::ThreadRestrictions::ScopedAllowIO allow_io;
255 // Only run test if run-time feature corresponding to |rtc_use_h264| is on. 247 // Only run test if run-time feature corresponding to |rtc_use_h264| is on.
256 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { 248 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
257 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " 249 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
258 "Skipping WebRtcInternalsPerfBrowserTest." 250 "Skipping WebRtcInternalsPerfBrowserTest."
259 "MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264 (test " 251 "MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264 (test "
260 "\"OK\")"; 252 "\"OK\")";
261 return; 253 return;
262 } 254 }
263 RunsAudioVideoCall60SecsAndLogsInternalMetrics("H264"); 255 RunsAudioVideoCall60SecsAndLogsInternalMetrics("H264");
264 } 256 }
265 257
266 #endif // BUILDFLAG(RTC_USE_H264) 258 #endif // BUILDFLAG(RTC_USE_H264)
267 259
268 IN_PROC_BROWSER_TEST_F( 260 IN_PROC_BROWSER_TEST_F(
269 WebRtcInternalsPerfBrowserTest, 261 WebRtcInternalsPerfBrowserTest,
270 MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsDefault) { 262 MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsDefault) {
271 base::ThreadRestrictions::ScopedAllowIO allow_io; 263 base::ThreadRestrictions::ScopedAllowIO allow_io;
272 RunsOneWayCall60SecsAndLogsInternalMetrics("", false); 264 RunsOneWayCall60SecsAndLogsInternalMetrics("", false);
273 } 265 }
274 266
275 IN_PROC_BROWSER_TEST_F( 267 IN_PROC_BROWSER_TEST_F(
276 WebRtcInternalsPerfBrowserTest, 268 WebRtcInternalsPerfBrowserTest,
277 MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsWithOpusDtx) { 269 MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsWithOpusDtx) {
278 base::ThreadRestrictions::ScopedAllowIO allow_io; 270 base::ThreadRestrictions::ScopedAllowIO allow_io;
279 RunsOneWayCall60SecsAndLogsInternalMetrics("", true); 271 RunsOneWayCall60SecsAndLogsInternalMetrics("", true);
280 } 272 }
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