Misc. cleanup, components/ edition.

* Shorten code
* Use const more
* Inline temps
* Use safe conversions for float -> int
* TimeDelta::InMicrosecondsF() returns a double


Bug: none
Change-Id: I798ee7107bcbda863f95ee7921c4ddfd76768183
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359008
Commit-Queue: Cait Phillips <caitkp@chromium.org>
Reviewed-by: Cait Phillips <caitkp@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799616}

components/cronet/native/test/url_request_test.cc

@@ -1514,10 +1514,9 @@ TEST_P(UrlRequestTest, PerfTest) {
   LOG(INFO) << "Single Iteration time "
             << delta.InMillisecondsF() / kTestIterations << " ms";
 
-  double bytes_per_ms =
-      kDownloadSize * kTestIterations / delta.InMillisecondsF();
-  double megabytes_per_ms = bytes_per_ms / 1000000;
-  double megabits_per_second = megabytes_per_ms * 8 * 1000;
+  const double bytes_per_second =
+      kDownloadSize * kTestIterations / delta.InSecondsF();
+  const double megabits_per_second = bytes_per_second / 1'000'000 * 8;
   LOG(INFO) << "Average Throughput: " << megabits_per_second << " mbps";
 
   Cronet_EngineParams_Destroy(engine_params);

components/feed/core/common/user_classifier.cc

@@ -283,7 +283,7 @@ double UserClassifier::GetHoursSinceLastTime(Event event) const {
     return 0;
   }
 
-  base::TimeDelta since_last_time =
+  const base::TimeDelta since_last_time =
       clock_->Now() - pref_service_->GetTime(GetLastTimeKey(event));
   return since_last_time / base::TimeDelta::FromHours(1);
 }

components/media_message_center/media_controls_progress_view.cc

@@ -88,11 +88,9 @@ void MediaControlsProgressView::UpdateProgress(
   if (media_position.playback_rate() == 0 && update_progress_timer_.IsRunning())
     update_progress_timer_.Stop();
 
-  base::TimeDelta current_position = media_position.GetPosition();
-  base::TimeDelta duration = media_position.duration();
-
-  double progress = current_position / duration;
-  SetBarProgress(progress);
+  const base::TimeDelta current_position = media_position.GetPosition();
+  const base::TimeDelta duration = media_position.duration();
+  SetBarProgress(current_position / duration);
 
   // Time formatting can't yet represent durations greater than 24 hours in
   // base::DURATION_WIDTH_NUMERIC format.

components/ntp_snippets/user_classifier.cc

@@ -358,7 +358,7 @@ double UserClassifier::GetHoursSinceLastTime(Metric metric) const {
     return 0;
   }
 
-  base::TimeDelta since_last_time =
+  const base::TimeDelta since_last_time =
       clock_->Now() - DeserializeTime(pref_service_->GetInt64(
                           kLastTimeKeys[static_cast<int>(metric)]));
   return since_last_time / base::TimeDelta::FromHours(1);

components/omnibox/browser/shortcuts_provider.cc

@@ -15,6 +15,7 @@
 #include "base/check_op.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
+#include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
@@ -394,11 +395,10 @@ int ShortcutsProvider::CalculateScore(
   // (1.0 / each 5 additional hits), up to a maximum of 5x as long.
   const double kMaxDecaySpeedDivisor = 5.0;
   const double kNumUsesPerDecaySpeedDivisorIncrement = 5.0;
-  double decay_divisor = std::min(
+  const double decay_divisor = std::min(
       kMaxDecaySpeedDivisor,
       (shortcut.number_of_hits + kNumUsesPerDecaySpeedDivisorIncrement - 1) /
           kNumUsesPerDecaySpeedDivisorIncrement);
 
-  return static_cast<int>((base_score / exp(decay_exponent / decay_divisor)) +
-                          0.5);
+  return base::ClampRound(base_score / exp(decay_exponent / decay_divisor));
 }

components/performance_manager/graph/policies/tab_loading_frame_navigation_policy_unittest.cc

@@ -163,10 +163,9 @@ class TabLoadingFrameNavigationPolicyTest
 
   // The current time, expressed as a multiple of the timeout period.
   double GetRelativeTime() {
-    base::TimeTicks now = task_environment()->GetMockTickClock()->NowTicks();
-    base::TimeDelta elapsed = now - start_;
-    double relative = elapsed / policy_->GetMaxTimeoutForTesting();
-    return relative;
+    const base::TimeTicks now =
+        task_environment()->GetMockTickClock()->NowTicks();
+    return (now - start_) / policy_->GetMaxTimeoutForTesting();
   }
 
  private:

components/sync/engine_impl/sync_scheduler_impl_unittest.cc

@@ -1994,9 +1994,10 @@ TEST_F(SyncSchedulerImplTest, PollOnStartUpWithinBoundsAfterLongPause) {
   bool found_delay_greater_than_5_permille = false;
   bool found_delay_less_or_equal_5_permille = false;
   for (int i = 0; i < 10000; ++i) {
-    base::Time result = ComputeLastPollOnStart(last_poll, poll_interval, now);
-    base::TimeDelta delay = result + poll_interval - now;
-    double fraction = delay / poll_interval;
+    const base::Time result =
+        ComputeLastPollOnStart(last_poll, poll_interval, now);
+    const base::TimeDelta delay = result + poll_interval - now;
+    const double fraction = delay / poll_interval;
     if (fraction > 0.005) {
       found_delay_greater_than_5_permille = true;
     } else {

components/viz/common/frame_sinks/begin_frame_args.cc

@@ -144,9 +144,10 @@ void BeginFrameArgs::AsValueInto(base::trace_event::TracedValue* state) const {
   state->SetString("subtype", TypeToString(type));
   state->SetInteger("source_id", frame_id.source_id);
   state->SetInteger("sequence_number", frame_id.sequence_number);
-  state->SetDouble("frame_time_us", frame_time.since_origin().InMicroseconds());
-  state->SetDouble("deadline_us", deadline.since_origin().InMicroseconds());
-  state->SetDouble("interval_us", interval.InMicroseconds());
+  state->SetDouble("frame_time_us",
+                   frame_time.since_origin().InMicrosecondsF());
+  state->SetDouble("deadline_us", deadline.since_origin().InMicrosecondsF());
+  state->SetDouble("interval_us", interval.InMicrosecondsF());
 #ifndef NDEBUG
   state->SetString("created_from", created_from.ToString());
 #endif

components/viz/common/frame_sinks/delay_based_time_source.cc

@@ -168,11 +168,11 @@ void DelayBasedTimeSource::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetString("type", TypeString());
   state->SetDouble("last_tick_time_us",
-                   LastTickTime().since_origin().InMicroseconds());
+                   LastTickTime().since_origin().InMicrosecondsF());
   state->SetDouble("next_tick_time_us",
-                   NextTickTime().since_origin().InMicroseconds());
-  state->SetDouble("interval_us", interval_.InMicroseconds());
-  state->SetDouble("timebase_us", timebase_.since_origin().InMicroseconds());
+                   NextTickTime().since_origin().InMicrosecondsF());
+  state->SetDouble("interval_us", interval_.InMicrosecondsF());
+  state->SetDouble("timebase_us", timebase_.since_origin().InMicrosecondsF());
   state->SetBoolean("active", active_);
 }