Revert "Add VP9 profile 2 end-to-end tests"

This reverts commit 176f1b6a.

Reason for revert: https://crbug.com/921003

Original change's description:
> Add VP9 profile 2 end-to-end tests
> 
> Bug: 908945
> Change-Id: Ie45a80acd72298e7d7ab4db240f086c2a8b4fb0c
> Reviewed-on: https://chromium-review.googlesource.com/c/1374571
> Commit-Queue: Emircan Uysaler <emircan@chromium.org>
> Reviewed-by: Henrik Boström <hbos@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#621568}

TBR=emircan@chromium.org,hbos@chromium.org

Change-Id: I9fdbd4690b8475b09d5a2eb7f2a75bbcd45bbd67
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 908945, 921003
Reviewed-on: https://chromium-review.googlesource.com/c/1406810Reviewed-by: Max Morin <maxmorin@chromium.org>
Commit-Queue: Max Morin <maxmorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621982}

chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc

@@ -116,8 +116,7 @@ class WebRtcInternalsPerfBrowserTest : public WebRtcTestBase {
   void RunsAudioVideoCall60SecsAndLogsInternalMetrics(
       const std::string& video_codec,
       bool prefer_hw_video_codec = false,
-      const std::string& video_codec_profile = std::string(),
-      const std::string& video_codec_print_modifier = std::string()) {
+      const std::string& video_codec_profile = std::string()) {
     ASSERT_TRUE(test::HasReferenceFilesInCheckout());
     ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -134,10 +133,8 @@ class WebRtcInternalsPerfBrowserTest : public WebRtcTestBase {
     SetupPeerconnectionWithLocalStream(right_tab);
 
     if (!video_codec.empty()) {
-      SetDefaultVideoCodec(left_tab, video_codec, prefer_hw_video_codec,
-                           video_codec_profile);
-      SetDefaultVideoCodec(right_tab, video_codec, prefer_hw_video_codec,
-                           video_codec_profile);
+      SetDefaultVideoCodec(left_tab, video_codec, prefer_hw_video_codec);
+      SetDefaultVideoCodec(right_tab, video_codec, prefer_hw_video_codec);
     }
     NegotiateCall(left_tab, right_tab);
 
@@ -158,11 +155,8 @@ class WebRtcInternalsPerfBrowserTest : public WebRtcTestBase {
     const base::DictionaryValue* first_pc_dict =
         GetDataOnPeerConnection(all_data.get(), 0);
     ASSERT_TRUE(first_pc_dict != NULL);
-    const std::string print_modifier = video_codec_print_modifier.empty()
-                                           ? video_codec
-                                           : video_codec_print_modifier;
-    test::PrintBweForVideoMetrics(*first_pc_dict, "", print_modifier);
-    test::PrintMetricsForAllStreams(*first_pc_dict, "", print_modifier);
+    test::PrintBweForVideoMetrics(*first_pc_dict, "", video_codec);
+    test::PrintMetricsForAllStreams(*first_pc_dict, "", video_codec);
 
     HangUp(left_tab);
     HangUp(right_tab);
@@ -246,15 +240,6 @@ IN_PROC_BROWSER_TEST_F(
   RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP9");
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebRtcInternalsPerfBrowserTest,
-    MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9Profile2) {
-  base::ScopedAllowBlockingForTesting allow_blocking;
-  RunsAudioVideoCall60SecsAndLogsInternalMetrics(
-      "VP9", true /* prefer_hw_video_codec */,
-      WebRtcTestBase::kVP9Profile2Specifier, "VP9p2");
-}
-
 #if BUILDFLAG(RTC_USE_H264)
 
 IN_PROC_BROWSER_TEST_F(

chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc

@@ -127,27 +127,25 @@ class WebRtcStatsPerfBrowserTest : public WebRtcTestBase {
 
   void RunsAudioAndVideoCallCollectingMetricsWithAudioCodec(
       const std::string& audio_codec) {
-    RunsAudioAndVideoCallCollectingMetrics(
-        audio_codec, kUseDefaultVideoCodec, false /* prefer_hw_video_codec */,
-        "" /* video_codec_profile */, "" /* video_codec_print_modifier */);
+    RunsAudioAndVideoCallCollectingMetrics(audio_codec, kUseDefaultVideoCodec,
+                                           false /* prefer_hw_video_codec */,
+                                           "");
   }
 
   void RunsAudioAndVideoCallCollectingMetricsWithVideoCodec(
       const std::string& video_codec,
       bool prefer_hw_video_codec = false,
-      const std::string& video_codec_profile = std::string(),
-      const std::string& video_codec_print_modifier = std::string()) {
-    RunsAudioAndVideoCallCollectingMetrics(
-        kUseDefaultAudioCodec, video_codec, prefer_hw_video_codec,
-        video_codec_profile, video_codec_print_modifier);
+      const std::string& video_codec_profile = std::string()) {
+    RunsAudioAndVideoCallCollectingMetrics(kUseDefaultAudioCodec, video_codec,
+                                           prefer_hw_video_codec,
+                                           video_codec_profile);
   }
 
   void RunsAudioAndVideoCallCollectingMetrics(
       const std::string& audio_codec,
       const std::string& video_codec,
       bool prefer_hw_video_codec,
-      const std::string& video_codec_profile,
-      const std::string& video_codec_print_modifier) {
+      const std::string& video_codec_profile) {
     StartCall(audio_codec, video_codec, prefer_hw_video_codec,
               video_codec_profile);
 
@@ -209,12 +207,10 @@ class WebRtcStatsPerfBrowserTest : public WebRtcTestBase {
           (video_bytes_received_after - video_bytes_received_before) /
           measure_duration_seconds;
 
-      std::string video_codec_modifier =
-          "_" + (video_codec_print_modifier.empty()
-                     ? video_codec
-                     : video_codec_print_modifier);
-      perf_test::PrintResult("video", video_codec_modifier, "send_rate",
-                             video_send_rate, "bytes/second", false);
+      std::string video_codec_modifier = "_" + video_codec;
+      perf_test::PrintResult(
+          "video", video_codec_modifier, "send_rate", video_send_rate,
+          "bytes/second", false);
       perf_test::PrintResult(
           "video", video_codec_modifier, "receive_rate", video_receive_rate,
           "bytes/second", false);
@@ -308,15 +304,6 @@ IN_PROC_BROWSER_TEST_F(
   RunsAudioAndVideoCallCollectingMetricsWithVideoCodec("VP9");
 }
 
-IN_PROC_BROWSER_TEST_F(
-    WebRtcStatsPerfBrowserTest,
-    MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9Profile2) {
-  base::ScopedAllowBlockingForTesting allow_blocking;
-  RunsAudioAndVideoCallCollectingMetricsWithVideoCodec(
-      "VP9", true /* prefer_hw_video_codec */,
-      WebRtcTestBase::kVP9Profile2Specifier, "VP9p2");
-}
-
 #if BUILDFLAG(RTC_USE_H264)
 
 IN_PROC_BROWSER_TEST_F(