commit 31c6035d68a535210334fa8e2e45755bca738746
author Emircan Uysaler <emircan@chromium.org> Fri Feb 01 22:34:36 2019
committer Commit Bot <commit-bot@chromium.org> Fri Feb 01 22:34:36 2019
tree 6a4cfd721569960d208b48c5b4eb5d740158b135
parent df126e0e02ce6a58ac12cc16a66193b6e779550f

Reenable VP9p2 tests that paint <video> on <canvas>

Since crbug.com/922198 is fixed, we can reenable them.

Bug: 921003
Change-Id: I5208c773b8a47ae38858c2f7a2f620fe8f965d97
Reviewed-on: https://chromium-review.googlesource.com/c/1450419
Reviewed-by: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Weiyong Yao <braveyao@chromium.org>
Commit-Queue: Emircan Uysaler <emircan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#628480}

chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc

diff --git a/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc b/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
index 4982f61..406a704 100644
--- a/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
@@ -247,17 +247,9 @@
   RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP9");
 }
 
-// See https://crbug.com/922198.
-#if defined(OS_MACOSX)
-#define MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2 \
-  DISABLED_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2
-#else
-#define MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2 \
-  MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2
-#endif  // defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(
     WebRtcInternalsPerfBrowserTest,
-    MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2) {
+    MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2) {
   base::ScopedAllowBlockingForTesting allow_blocking;
   RunsAudioVideoCall60SecsAndLogsInternalMetrics(
       "VP9", true /* prefer_hw_video_codec */,

chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc

diff --git a/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc b/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
index 0118e621..76fc623e 100644
--- a/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
@@ -309,17 +309,9 @@
   RunsAudioAndVideoCallCollectingMetricsWithVideoCodec("VP9");
 }
 
-// See https://crbug.com/922198.
-#if defined(OS_MACOSX)
-#define MAYBE_MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2 \
-  DISABLED_MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2
-#else
-#define MAYBE_MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2 \
-  MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2
-#endif  // defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(
     WebRtcStatsPerfBrowserTest,
-    MAYBE_MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2) {
+    MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2) {
   base::ScopedAllowBlockingForTesting allow_blocking;
   RunsAudioAndVideoCallCollectingMetricsWithVideoCodec(
       "VP9", true /* prefer_hw_video_codec */,