Use base::Clamp{Ceil,Floor,Round}() to convert float to int.

No intended behavior change.

Bug: none
Change-Id: Ib0496c5dcb42fb6388c3b68ab330ed36d39556dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345089Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797024}

ash/accessibility/spoken_feedback_enabler.cc

@@ -6,6 +6,7 @@
 
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/shell.h"
+#include "base/numerics/safe_conversions.h"
 #include "ui/events/base_event_utils.h"
 
 namespace ash {
@@ -33,7 +34,7 @@ SpokenFeedbackEnabler::~SpokenFeedbackEnabler() {}
 void SpokenFeedbackEnabler::OnTimer() {
   base::TimeTicks now = ui::EventTimeForNow();
   double tick_count_f = (now - start_time_) / kTimerDelay;
-  int tick_count = roundf(tick_count_f);
+  int tick_count = base::ClampRound(tick_count_f);
 
   AccessibilityControllerImpl* controller =
       Shell::Get()->accessibility_controller();

ash/accessibility/touch_accessibility_enabler.cc

@@ -11,6 +11,7 @@
 #include "base/check.h"
 #include "base/metrics/user_metrics.h"
 #include "base/notreached.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/time/default_tick_clock.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -161,7 +162,7 @@ void TouchAccessibilityEnabler::OnTimer() {
   base::TimeTicks now = Now();
   double tick_count_f =
       (now - two_finger_start_time_).InMillisecondsF() / kTimerDelayInMS;
-  int tick_count = roundf(tick_count_f);
+  int tick_count = base::ClampRound(tick_count_f);
 
   if (tick_count == kTimerTicksOfFirstSoundFeedback) {
     base::RecordAction(

ash/public/cpp/power_utils.cc

@@ -4,6 +4,7 @@
 
 #include "ash/public/cpp/power_utils.h"
 
+#include "base/numerics/safe_conversions.h"
 #include "base/time/time.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 
@@ -23,7 +24,7 @@ bool ShouldDisplayBatteryTime(const base::TimeDelta& time) {
 int GetRoundedBatteryPercent(double battery_percent) {
   // Minimum battery percentage rendered in UI.
   constexpr int kMinBatteryPercent = 1;
-  return std::max(kMinBatteryPercent, static_cast<int>(battery_percent + 0.5));
+  return std::max(kMinBatteryPercent, base::ClampRound(battery_percent));
 }
 
 void SplitTimeIntoHoursAndMinutes(const base::TimeDelta& time,
@@ -31,7 +32,7 @@ void SplitTimeIntoHoursAndMinutes(const base::TimeDelta& time,
                                   int* minutes) {
   DCHECK(hours);
   DCHECK(minutes);
-  const int total_minutes = static_cast<int>(time.InSecondsF() / 60 + 0.5);
+  const int total_minutes = base::ClampRound(time.InSecondsF() / 60);
   *hours = total_minutes / 60;
   *minutes = total_minutes % 60;
 }

ash/system/power/power_notification_controller.cc

@@ -12,6 +12,7 @@
 #include "ash/system/power/dual_role_notification.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/numerics/safe_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/chromeos/devicetype_utils.h"
 #include "ui/message_center/message_center.h"
@@ -199,7 +200,7 @@ bool PowerNotificationController::UpdateNotificationStateForRemainingTime() {
   // The notification includes a rounded minutes value, so round the estimate
   // received from the power manager to match.
   const int remaining_minutes =
-      static_cast<int>(remaining_time->InSecondsF() / 60.0 + 0.5);
+      base::ClampRound(remaining_time->InSecondsF() / 60.0);
 
   if (remaining_minutes >= kNoWarningMinutes ||
       PowerStatus::Get()->IsBatteryFull()) {

base/i18n/time_formatting.cc

@@ -11,6 +11,7 @@
 #include "base/i18n/unicodestring.h"
 #include "base/logging.h"
 #include "base/notreached.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "third_party/icu/source/common/unicode/utypes.h"
@@ -181,7 +182,7 @@ bool TimeDurationFormat(const TimeDelta time,
                         string16* out) {
   DCHECK(out);
   UErrorCode status = U_ZERO_ERROR;
-  const int total_minutes = static_cast<int>(time.InSecondsF() / 60 + 0.5);
+  const int total_minutes = base::ClampRound(time.InSecondsF() / 60);
   const int hours = total_minutes / 60;
   const int minutes = total_minutes % 60;
   UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width);

base/process/process_metrics.cc

@@ -8,6 +8,7 @@
 
 #include "base/check.h"
 #include "base/notreached.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 
@@ -25,7 +26,7 @@ int CalculateEventsPerSecond(uint64_t event_count,
   }
 
   int64_t events_delta = event_count - *last_event_count;
-  int64_t time_delta = (time - *last_calculated).InMicroseconds();
+  double time_delta = (time - *last_calculated).InSecondsF();
   if (time_delta == 0) {
     NOTREACHED();
     return 0;
@@ -34,11 +35,7 @@ int CalculateEventsPerSecond(uint64_t event_count,
   *last_calculated = time;
   *last_event_count = event_count;
 
-  int64_t events_delta_for_ms =
-      events_delta * base::Time::kMicrosecondsPerSecond;
-  // Round the result up by adding 1/2 (the second term resolves to 1/2 without
-  // dropping down into floating point).
-  return (events_delta_for_ms + time_delta / 2) / time_delta;
+  return base::ClampRound(events_delta / time_delta);
 }
 
 }  // namespace

cc/metrics/video_playback_roughness_reporter.cc

@@ -8,6 +8,7 @@
 
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/numerics/safe_conversions.h"
 #include "components/viz/common/quads/compositor_frame_metadata.h"
 
 namespace {
@@ -72,9 +73,9 @@ void VideoPlaybackRoughnessReporter::FrameSubmitted(
     }
 
     // Adjust frame window size to fit about 1 second of playback
-    double win_size = std::round(kDesiredWindowDuration /
-                                 info.intended_duration.value().InSecondsF());
-    frames_window_size_ = std::max(kMinWindowSize, static_cast<int>(win_size));
+    int win_size = base::ClampRound(
+        kDesiredWindowDuration / info.intended_duration.value().InSecondsF());
+    frames_window_size_ = std::max(kMinWindowSize, win_size);
     frames_window_size_ = std::min(frames_window_size_, kMaxWindowSize);
   }
 

chrome/browser/chromeos/policy/minimum_version_policy_handler.cc

@@ -4,12 +4,15 @@
 
 #include "chrome/browser/chromeos/policy/minimum_version_policy_handler.h"
 
-#include <cmath>
+#include <algorithm>
+#include <string>
+#include <utility>
 
 #include "ash/public/cpp/system_tray.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/strings/string16.h"
 #include "base/time/default_clock.h"
 #include "base/time/time.h"
@@ -79,8 +82,8 @@ BuildState* GetBuildState() {
 }
 
 int GetDaysRounded(base::TimeDelta time) {
-  return std::lround(time.InSecondsF() /
-                     base::TimeDelta::FromDays(1).InSecondsF());
+  return base::ClampRound(time.InSecondsF() /
+                          base::TimeDelta::FromDays(1).InSecondsF());
 }
 
 chromeos::UpdateEngineClient* GetUpdateEngineClient() {

chrome/browser/metrics/power_metrics_provider_mac_unittest.cc

@@ -139,9 +139,10 @@ TEST_F(PowerMetricsProviderTest, BatteryDischargeCaptureIsEarly) {
 
   // The discharge rate is normalized to be representative over
   // |kMetricsCollectionInterval|.
-  int discharge = (kFirstReading - kSecondReading) *
-                  kMetricsCollectionInterval.InSecondsF() /
-                  (second_capture_time - first_capture_time).InSeconds();
+  int discharge =
+      base::ClampFloor((kFirstReading - kSecondReading) *
+                       kMetricsCollectionInterval.InSecondsF() /
+                       (second_capture_time - first_capture_time).InSeconds());
   histogram_tester_.ExpectUniqueSample(kHistogramName, discharge, 1);
 }
 
@@ -188,8 +189,9 @@ TEST_F(PowerMetricsProviderTest, BatteryDischargeCaptureIsLate) {
 
   // The discharge rate is normalized to be representative over
   // |kMetricsCollectionInterval|.
-  int discharge = (kFirstReading - kSecondReading) *
-                  kMetricsCollectionInterval.InSecondsF() /
-                  (second_capture_time - first_capture_time).InSeconds();
+  int discharge =
+      base::ClampFloor((kFirstReading - kSecondReading) *
+                       kMetricsCollectionInterval.InSecondsF() /
+                       (second_capture_time - first_capture_time).InSeconds());
   histogram_tester_.ExpectUniqueSample(kHistogramName, discharge, 1);
 }

media/cast/common/clock_drift_smoother.cc

@@ -8,6 +8,7 @@
 
 #include "base/check.h"
 #include "base/notreached.h"
+#include "base/numerics/safe_conversions.h"
 
 namespace media {
 namespace cast {
@@ -22,8 +23,8 @@ ClockDriftSmoother::~ClockDriftSmoother() = default;
 
 base::TimeDelta ClockDriftSmoother::Current() const {
   DCHECK(!last_update_time_.is_null());
-  return base::TimeDelta::FromMicroseconds(static_cast<int64_t>(
-      estimate_us_ + 0.5));  // Round to nearest microsecond.
+  return base::TimeDelta::FromMicroseconds(
+      base::ClampRound<int64_t>(estimate_us_));
 }
 
 void ClockDriftSmoother::Reset(base::TimeTicks now,

media/filters/audio_clock.cc

@@ -11,6 +11,7 @@
 #include <cmath>
 
 #include "base/check_op.h"
+#include "base/numerics/safe_conversions.h"
 
 namespace media {
 
@@ -68,8 +69,8 @@ void AudioClock::WroteAudio(int frames_written,
 
 void AudioClock::CompensateForSuspendedWrites(base::TimeDelta elapsed,
                                               int delay_frames) {
-  const int64_t frames_elapsed =
-      elapsed.InMicroseconds() / microseconds_per_frame_ + 0.5;
+  const int64_t frames_elapsed = base::ClampRound<int64_t>(
+      elapsed.InMicrosecondsF() / microseconds_per_frame_);
 
   // No need to do anything if we're within the limits of our played out audio
   // or there are no delay frames, the next WroteAudio() call will expire

media/filters/audio_file_reader.cc

@@ -191,7 +191,7 @@ base::TimeDelta AudioFileReader::GetDuration() const {
 }
 
 int AudioFileReader::GetNumberOfFrames() const {
-  return static_cast<int>(ceil(GetDuration().InSecondsF() * sample_rate()));
+  return base::ClampCeil(GetDuration().InSecondsF() * sample_rate());
 }
 
 bool AudioFileReader::OpenDemuxerForTesting() {

media/renderers/video_renderer_impl.cc

@@ -13,6 +13,7 @@
 #include "base/feature_list.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/time/default_tick_clock.h"
@@ -517,8 +518,8 @@ void VideoRendererImpl::UpdateLatencyHintBufferingCaps_Locked(
     return;
 
   int latency_hint_frames =
-      std::round(latency_hint_->InMicrosecondsF() /
-                 average_frame_duration.InMicrosecondsF());
+      base::ClampRound(latency_hint_->InMicrosecondsF() /
+                       average_frame_duration.InMicrosecondsF());
 
   std::string clamp_string;
   if (latency_hint_frames > kAbsoluteMaxFrames) {

ui/compositor/layer_animator_unittest.cc

@@ -10,6 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_mock_clock_override.h"
@@ -3512,7 +3513,7 @@ TEST(LayerAnimatorTest,
   const float frame_interval =
       base::Time::kMillisecondsPerSecond / compositor->refresh_rate();
   const int kStartFrameNumber =
-      static_cast<int>(kAnimationDuration.InMillisecondsF() / frame_interval) *
+      base::ClampFloor(kAnimationDuration.InMillisecondsF() / frame_interval) *
       4;
   while (compositor->activated_frame_count() < kStartFrameNumber) {
     compositor->ScheduleFullRedraw();