Revert of Adds a WebRTC browser_test with opus dtx enabled.

chrome/browser/media/webrtc_perf_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
@@ skipping 15 matching lines @@
 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
 #include "content/public/common/features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/media_switches.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/perf/perf_test.h"
 
 static const char kMainWebrtcTestHtmlPage[] =
     "/webrtc/webrtc_jsep01_test.html";
 
-std::string MakePerfTestLabel(std::string base, bool opus_dtx) {
-  if (opus_dtx) {
-    return base + "_with_opus_dtx";
-  }
-  return base;
-}
-
 // Performance browsertest for WebRTC. This test is manual since it takes long
 // to execute and requires the reference files provided by the webrtc.DEPS
 // solution (which is only available on WebRTC internal bots).
 class WebRtcPerfBrowserTest : public WebRtcTestBase {
  public:
   void SetUpInProcessBrowserTestFixture() override {
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ skipping 69 matching lines @@
            "--ui-test-action-max-timeout to have a value of at least 100000.";
 
     content::WebContents* left_tab =
         OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
     content::WebContents* right_tab =
         OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
 
     SetupPeerconnectionWithLocalStream(left_tab);
     SetupPeerconnectionWithLocalStream(right_tab);
 
-    if (!video_codec.empty()) {
-      SetDefaultVideoCodec(left_tab, video_codec);
-      SetDefaultVideoCodec(right_tab, video_codec);
-    }
-    NegotiateCall(left_tab, right_tab);
+    NegotiateCall(left_tab, right_tab, video_codec);
 
     StartDetectingVideo(left_tab, "remote-view");
     StartDetectingVideo(right_tab, "remote-view");
 
     WaitForVideoToPlay(left_tab);
     WaitForVideoToPlay(right_tab);
 
     // Let values stabilize, bandwidth ramp up, etc.
     test::SleepInJavascript(left_tab, 60000);
 
     // Start measurements.
     std::unique_ptr<base::DictionaryValue> all_data =
         MeasureWebRtcInternalsData(10000);
     ASSERT_TRUE(all_data.get() != NULL);
 
     const base::DictionaryValue* first_pc_dict =
         GetDataOnPeerConnection(all_data.get(), 0);
     ASSERT_TRUE(first_pc_dict != NULL);
     test::PrintBweForVideoMetrics(*first_pc_dict, "", video_codec);
     test::PrintMetricsForAllStreams(*first_pc_dict, "", video_codec);
 
     HangUp(left_tab);
     HangUp(right_tab);
   }
 
   void RunsOneWayCall60SecsAndLogsInternalMetrics(
-      const std::string& video_codec,
-      bool opus_dtx) {
+      const std::string& video_codec) {
     ASSERT_TRUE(test::HasReferenceFilesInCheckout());
     ASSERT_TRUE(embedded_test_server()->Start());
 
     ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 100)
         << "This is a long-running test; you must specify "
            "--ui-test-action-max-timeout to have a value of at least 100000.";
 
     content::WebContents* left_tab =
         OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
     content::WebContents* right_tab =
         OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
 
     SetupPeerconnectionWithLocalStream(left_tab);
     SetupPeerconnectionWithoutLocalStream(right_tab);
 
-    if (!video_codec.empty()) {
-      SetDefaultVideoCodec(left_tab, video_codec);
-      SetDefaultVideoCodec(right_tab, video_codec);
-    }
-    if (opus_dtx) {
-      EnableOpusDtx(left_tab);
-      EnableOpusDtx(right_tab);
-    }
-    NegotiateCall(left_tab, right_tab);
+    NegotiateCall(left_tab, right_tab, video_codec);
 
     // Remote video will only play in one tab since the call is one-way.
     StartDetectingVideo(right_tab, "remote-view");
     WaitForVideoToPlay(right_tab);
 
     // Let values stabilize, bandwidth ramp up, etc.
     test::SleepInJavascript(left_tab, 60000);
 
     std::unique_ptr<base::DictionaryValue> all_data =
         MeasureWebRtcInternalsData(10000);
     ASSERT_TRUE(all_data.get() != NULL);
 
     // This assumes the sending peer connection is always listed first in the
     // data store, and the receiving second.
     const base::DictionaryValue* first_pc_dict =
         GetDataOnPeerConnection(all_data.get(), 0);
     ASSERT_TRUE(first_pc_dict != NULL);
-    test::PrintBweForVideoMetrics(
-        *first_pc_dict, MakePerfTestLabel("_sendonly", opus_dtx), video_codec);
-    test::PrintMetricsForSendStreams(
-        *first_pc_dict, MakePerfTestLabel("_sendonly", opus_dtx), video_codec);
+    test::PrintBweForVideoMetrics(*first_pc_dict, "_sendonly", video_codec);
+    test::PrintMetricsForSendStreams(*first_pc_dict, "_sendonly", video_codec);
 
     const base::DictionaryValue* second_pc_dict =
         GetDataOnPeerConnection(all_data.get(), 1);
     ASSERT_TRUE(second_pc_dict != NULL);
-    test::PrintBweForVideoMetrics(
-        *second_pc_dict, MakePerfTestLabel("_recvonly", opus_dtx), video_codec);
-    test::PrintMetricsForRecvStreams(
-        *second_pc_dict, MakePerfTestLabel("_recvonly", opus_dtx), video_codec);
+    test::PrintBweForVideoMetrics(*second_pc_dict, "_recvonly", video_codec);
+    test::PrintMetricsForRecvStreams(*second_pc_dict, "_recvonly", video_codec);
 
     HangUp(left_tab);
     HangUp(right_tab);
   }
 };
 
 // This is manual for its long execution time.
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
@@ skipping 20 matching lines @@
     return;
   }
   RunsAudioVideoCall60SecsAndLogsInternalMetrics("H264");
 }
 
 #endif  // BUILDFLAG(RTC_USE_H264)
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
     MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsDefault) {
-  RunsOneWayCall60SecsAndLogsInternalMetrics("", false);
+  RunsOneWayCall60SecsAndLogsInternalMetrics("");
 }
-
-IN_PROC_BROWSER_TEST_F(
-    WebRtcPerfBrowserTest,
-    MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsWithOpusDtx) {
-  RunsOneWayCall60SecsAndLogsInternalMetrics("", true);
-}