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

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

Issue 2903463002: Revert of Disable WebRtcVideoQualityBrowserTest.TestVideoQualityH264/0 on Win bots. (Closed)
Patch Set: 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 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 } 350 }
351 351
352 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, 352 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
353 MANUAL_TestVideoQualityVp9) { 353 MANUAL_TestVideoQualityVp9) {
354 base::ThreadRestrictions::ScopedAllowIO allow_io; 354 base::ThreadRestrictions::ScopedAllowIO allow_io;
355 TestVideoQuality("VP9"); 355 TestVideoQuality("VP9");
356 } 356 }
357 357
358 #if BUILDFLAG(RTC_USE_H264) 358 #if BUILDFLAG(RTC_USE_H264)
359 359
360 // TODO(philipel): Remove disable condition when H264 flakyness has been
361 // investigated (crbug.com/722746).
362 #if defined(OS_WIN)
363 #define MAYBE_TestVideoQualityH264 DISABLED_TestVideoQualityH264
364 #else
365 #define MAYBE_TestVideoQualityH264 MANUAL_TestVideoQualityH264
366 #endif
367 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, 360 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
368 MAYBE_TestVideoQualityH264) { 361 MANUAL_TestVideoQualityH264) {
369 base::ThreadRestrictions::ScopedAllowIO allow_io; 362 base::ThreadRestrictions::ScopedAllowIO allow_io;
370 // Only run test if run-time feature corresponding to |rtc_use_h264| is on. 363 // Only run test if run-time feature corresponding to |rtc_use_h264| is on.
371 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { 364 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
372 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " 365 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
373 "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 " 366 "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 "
374 "(test \"OK\")"; 367 "(test \"OK\")";
375 return; 368 return;
376 } 369 }
377 TestVideoQuality("H264"); 370 TestVideoQuality("H264");
378 } 371 }
379 372
380 #endif // BUILDFLAG(RTC_USE_H264) 373 #endif // BUILDFLAG(RTC_USE_H264)
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