Revert D67150918: enable bm_estimate_time to accept bm_max_secs

Differential Revision:
D67150918

Original commit changeset: 4f23e83d39b1

Original Phabricator Diff: D67150918

fbshipit-source-id: 620689aee0b0835281fb0b30d20fa073049ffb9b

folly/Benchmark.cpp

@@ -263,11 +263,11 @@ static std::pair<double, UserCounters> runBenchmarkGetNSPerIterationEstimate(
   size_t actualTrials = 0;
   const unsigned int estimateCount = to_integral(max(1.0, 5e+7 / estPerIter));
   std::vector<TrialResultType> trialResults(FLAGS_bm_max_trials);
-  const auto maxRunTime = seconds(max(5, FLAGS_bm_max_secs));
+  const auto maxRunTime = seconds(5);
   auto globalStart = high_resolution_clock::now();
 
   // Run benchmark up to trial times with at least 0.5 sec each
-  // Or until we run out of allowed time (max(5, FLAGS_bm_max_secs))
+  // Or until we run out of alowed time (5sec)
   for (size_t tryId = 0; tryId < FLAGS_bm_max_trials; tryId++) {
     detail::TimeIterData timeIterData = fun(estimateCount);
     auto nsecs = duration_cast<nanoseconds>(timeIterData.duration);