Revert of Implement unit test specific test launcher timeout (patchset #6 of...

Revert of Implement unit test specific test launcher timeout (patchset #6 of https://codereview.chromium.org/476543004/)

Reason for revert:
Multiple tests are timing out on dbg bots.

Original issue's description:
> Implement unit test specific test launcher timeout
>
> BUG=402213

TBR=jam@chromium.org,dalecurtis@chromium.org,rileya@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=402213

Review URL: https://codereview.chromium.org/504813003

Cr-Commit-Position: refs/heads/master@{#291682}

base/test/launcher/unit_test_launcher.cc

@@ -186,7 +186,7 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
     test_launcher->LaunchChildGTestProcess(
         cmd_line,
         std::string(),
-        TestTimeouts::test_launcher_unit_timeout(),
+        TestTimeouts::test_launcher_timeout(),
         use_job_objects_ ? TestLauncher::USE_JOB_OBJECTS : 0,
         Bind(&UnitTestLauncherDelegate::SerialGTestCallback,
              Unretained(this),
@@ -218,7 +218,7 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
     // Note: do NOT parse child's stdout to do that, it's known to be
     // unreliable (e.g. buffering issues can mix up the output).
     base::TimeDelta timeout =
-        test_names.size() * TestTimeouts::test_launcher_unit_timeout();
+        test_names.size() * TestTimeouts::test_launcher_timeout();
 
     GTestCallbackState callback_state;
     callback_state.test_launcher = test_launcher;
@@ -345,7 +345,7 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
             // For consistent handling of tests independent of order and other
             // factors, mark them as timing out.
             if (test_result.elapsed_time >
-                TestTimeouts::test_launcher_unit_timeout()) {
+                TestTimeouts::test_launcher_timeout()) {
               test_result.status = TestResult::TEST_TIMEOUT;
             }
           }

base/test/test_switches.cc

@@ -50,7 +50,6 @@ const char switches::kTestLauncherTotalShards[] =
 
 // Time (in milliseconds) that the tests should wait before timing out.
 const char switches::kTestLauncherTimeout[] = "test-launcher-timeout";
-const char switches::kTestLauncherUnitTimeout[] = "test-launcher-unit-timeout";
 // TODO(phajdan.jr): Clean up the switch names.
 const char switches::kTestTinyTimeout[] = "test-tiny-timeout";
 const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";

base/test/test_switches.h

@@ -21,7 +21,6 @@ extern const char kTestLauncherPrintTestStdio[];
 extern const char kTestLauncherShardIndex[];
 extern const char kTestLauncherTotalShards[];
 extern const char kTestLauncherTimeout[];
-extern const char kTestLauncherUnitTimeout[];
 extern const char kTestTinyTimeout[];
 extern const char kUiTestActionTimeout[];
 extern const char kUiTestActionMaxTimeout[];

base/test/test_timeouts.cc

@@ -72,7 +72,6 @@ int TestTimeouts::action_max_timeout_ms_ = 45000;
 int TestTimeouts::action_max_timeout_ms_ = 30000;
 #endif  // NDEBUG
 
-int TestTimeouts::test_launcher_unit_timeout_ms_ = 5000;
 int TestTimeouts::test_launcher_timeout_ms_ = 45000;
 
 // static
@@ -99,16 +98,12 @@ void TestTimeouts::Initialize() {
                     &action_max_timeout_ms_);
 
   // Test launcher timeout is independent from anything above action timeout.
-  InitializeTimeout(switches::kTestLauncherUnitTimeout, action_timeout_ms_,
-                    &test_launcher_unit_timeout_ms_);
-  InitializeTimeout(switches::kTestLauncherTimeout,
-                    test_launcher_unit_timeout_ms_,
+  InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
                     &test_launcher_timeout_ms_);
 
   // The timeout values should be increasing in the right order.
   CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
   CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
 
-  CHECK(action_timeout_ms_ <= test_launcher_unit_timeout_ms_);
-  CHECK(test_launcher_unit_timeout_ms_ <= test_launcher_timeout_ms_);
+  CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
 }

base/test/test_timeouts.h

@@ -38,14 +38,7 @@ class TestTimeouts {
     return base::TimeDelta::FromMilliseconds(action_max_timeout_ms_);
   }
 
-  // Timeout for a single unit test launched using built-in test launcher.
-  // Do not use outside of the test launcher.
-  static base::TimeDelta test_launcher_unit_timeout() {
-    DCHECK(initialized_);
-    return base::TimeDelta::FromMilliseconds(test_launcher_unit_timeout_ms_);
-  }
-
-  // Timeout for a single test launched using built-in test launcher.
+  // Timeout for a single test launched used built-in test launcher.
   // Do not use outside of the test launcher.
   static base::TimeDelta test_launcher_timeout() {
     DCHECK(initialized_);
@@ -58,7 +51,6 @@ class TestTimeouts {
   static int tiny_timeout_ms_;
   static int action_timeout_ms_;
   static int action_max_timeout_ms_;
-  static int test_launcher_unit_timeout_ms_;
   static int test_launcher_timeout_ms_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);

media/base/demuxer_perftest.cc

@@ -207,33 +207,26 @@ static void RunDemuxerBenchmark(const std::string& filename) {
                          true);
 }
 
-class DemuxerPerfTest : public testing::TestWithParam<const char*> {
-};
-
-const char* kDemuxerBenchmarks[] = {
-  "bear.ogv",
-  "bear-640x360.webm",
-  "sfx_s16le.wav",
+#if defined(OS_WIN)
+// http://crbug.com/399002
+#define MAYBE_Demuxer DISABLED_Demuxer
+#else
+#define MAYBE_Demuxer Demuxer
+#endif
+TEST(DemuxerPerfTest, MAYBE_Demuxer) {
+  RunDemuxerBenchmark("bear.ogv");
+  RunDemuxerBenchmark("bear-640x360.webm");
+  RunDemuxerBenchmark("sfx_s16le.wav");
 #if defined(USE_PROPRIETARY_CODECS)
-  "bear-1280x720.mp4",
-  "sfx.mp3",
+  RunDemuxerBenchmark("bear-1280x720.mp4");
+  RunDemuxerBenchmark("sfx.mp3");
 #endif
 #if defined(OS_CHROMEOS)
-  "bear.flac",
+  RunDemuxerBenchmark("bear.flac");
 #endif
 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
-  "bear.avi",
+  RunDemuxerBenchmark("bear.avi");
 #endif
-};
-
-TEST_P(DemuxerPerfTest, Demuxer) {
-  RunDemuxerBenchmark(GetParam());
 }
 
-#if !defined(OS_WIN)
-// http://crbug.com/399002
-INSTANTIATE_TEST_CASE_P(, DemuxerPerfTest,
-                        testing::ValuesIn(kDemuxerBenchmarks));
-#endif  // !defined(OS_WIN)
-
 }  // namespace media