Revert of Disable flaky WebRTC tests.

chrome/browser/media/webrtc/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"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
-#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h"
 #include "chrome/browser/media/webrtc/webrtc_browsertest_perf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 189 matching lines @@
     test::PrintBweForVideoMetrics(
         *second_pc_dict, MakePerfTestLabel("_recvonly", opus_dtx), video_codec);
     test::PrintMetricsForRecvStreams(
         *second_pc_dict, MakePerfTestLabel("_recvonly", opus_dtx), video_codec);
 
     HangUp(left_tab);
     HangUp(right_tab);
   }
 };
 
-// RunsAudioVideoCall60SecsAndLogsInternalMetrics tests are flaky on Linux.
-// On other platforms, they are manual due to their long execution time.
-// See http://crbug.com/webrtc/6484.
-#if defined(OS_LINUX)
-#define MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8 \
-  DISABLED_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8
-#define MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9 \
-  DISABLED_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9
-#define MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264 \
-  DISABLED_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264
-#else
-#define MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8 \
-  MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8
-#define MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9 \
-  MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9
-#define MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264 \
-  MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264
-#endif
+// This is manual for its long execution time.
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
-    MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8) {
+    MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8) {
   RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP8");
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
-    MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9) {
+    MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9) {
   RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP9");
 }
 
 #if BUILDFLAG(RTC_USE_H264)
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
-    MAYBE_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264) {
+    MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264) {
   // Only run test if run-time feature corresponding to |rtc_use_h264| is on.
   if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
     LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
         "Skipping WebRtcPerfBrowserTest.MANUAL_RunsAudioVideoCall60SecsAndLogs"
         "InternalMetricsH264 (test \"OK\")";
     return;
   }
   RunsAudioVideoCall60SecsAndLogsInternalMetrics("H264");
 }
 
 #endif  // BUILDFLAG(RTC_USE_H264)
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
     MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsDefault) {
   RunsOneWayCall60SecsAndLogsInternalMetrics("", false);
 }
 
 IN_PROC_BROWSER_TEST_F(
     WebRtcPerfBrowserTest,
     MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsWithOpusDtx) {
   RunsOneWayCall60SecsAndLogsInternalMetrics("", true);
 }