Make DefaultTickClock::GetInstance return a const TickClock*.

Now that TickClock::NowTicks is a const function, change consumers so that they hold a const pointer to a clock. TBR=sky@chromium.org Bug: None Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_mojo;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: I698230dfd458eb7b6d1c4566c6ed8b12db097c0e Reviewed-on: https://chromium-review.googlesource.com/982621 Reviewed-by: Greg Thompson <grt@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Gabriel Charette <gab@chromium.org> Commit-Queue: Greg Thompson <grt@chromium.org> Cr-Commit-Position: refs/heads/master@{#547631}
marcosholgado · Apr 3, 2018 · aa48ce8 · aa48ce8
1 parent 077b476
commit aa48ce8
Show file tree

Hide file tree

Showing 313 changed files with 1,052 additions and 525 deletions.
diff --git a/ash/accessibility/touch_accessibility_enabler.h b/ash/accessibility/touch_accessibility_enabler.h
@@ -125,7 +125,7 @@ class ASH_EXPORT TouchAccessibilityEnabler : public ui::EventHandler {
 
   // When touch_accessibility_enabler gets time relative to real time during
   // testing, this clock is set to the simulated clock and used.
-  base::TickClock* tick_clock_;
+  const base::TickClock* tick_clock_;
 
   // Whether or not we currently have an event handler installed. It can
   // be removed when TouchExplorationController is running.

diff --git a/ash/metrics/task_switch_time_tracker.cc b/ash/metrics/task_switch_time_tracker.cc
@@ -30,7 +30,7 @@ TaskSwitchTimeTracker::TaskSwitchTimeTracker(const std::string& histogram_name)
                             base::DefaultTickClock::GetInstance()) {}
 
 TaskSwitchTimeTracker::TaskSwitchTimeTracker(const std::string& histogram_name,
-                                             base::TickClock* tick_clock)
+                                             const base::TickClock* tick_clock)
     : histogram_name_(histogram_name), tick_clock_(tick_clock) {}
 
 TaskSwitchTimeTracker::~TaskSwitchTimeTracker() = default;

diff --git a/ash/metrics/task_switch_time_tracker.h b/ash/metrics/task_switch_time_tracker.h
@@ -40,7 +40,7 @@ class ASH_EXPORT TaskSwitchTimeTracker {
   // This doesn't take the ownership of the clock. |tick_clock| must outlive
   // TaskSwitchTimeTracker.
   TaskSwitchTimeTracker(const std::string& histogram_name,
-                        base::TickClock* tick_clock);
+                        const base::TickClock* tick_clock);
 
   // Returns true if |last_action_time_| has a valid value.
   bool HasLastActionTime() const;
@@ -66,7 +66,7 @@ class ASH_EXPORT TaskSwitchTimeTracker {
   base::TimeTicks last_action_time_ = base::TimeTicks();
 
   // The clock used to determine the |last_action_time_|.
-  base::TickClock* tick_clock_;
+  const base::TickClock* tick_clock_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskSwitchTimeTracker);
 };

diff --git a/ash/shelf/shelf_button_pressed_metric_tracker.h b/ash/shelf/shelf_button_pressed_metric_tracker.h
@@ -70,7 +70,7 @@ class ASH_EXPORT ShelfButtonPressedMetricTracker {
   void ResetMinimizedData();
 
   // Time source for performed action times.
-  base::TickClock* tick_clock_;
+  const base::TickClock* tick_clock_;
 
   // Stores the time of the last window minimize action.
   base::TimeTicks time_of_last_minimize_;

diff --git a/ash/shelf/shelf_button_pressed_metric_tracker_test_api.cc b/ash/shelf/shelf_button_pressed_metric_tracker_test_api.cc
@@ -17,7 +17,7 @@ ShelfButtonPressedMetricTrackerTestAPI::
     ~ShelfButtonPressedMetricTrackerTestAPI() = default;
 
 void ShelfButtonPressedMetricTrackerTestAPI::SetTickClock(
-    base::TickClock* tick_clock) {
+    const base::TickClock* tick_clock) {
   shelf_button_pressed_metric_tracker_->tick_clock_ = tick_clock;
 }
 

diff --git a/ash/shelf/shelf_button_pressed_metric_tracker_test_api.h b/ash/shelf/shelf_button_pressed_metric_tracker_test_api.h
@@ -27,7 +27,7 @@ class ShelfButtonPressedMetricTrackerTestAPI {
   // Set's the |tick_clock_| on the internal ShelfButtonPressedMetricTracker.
   // This doesn't take the ownership of the clock. |tick_clock| must outlive the
   // ShelfButtonPressedMetricTracker instance.
-  void SetTickClock(base::TickClock* tick_clock);
+  void SetTickClock(const base::TickClock* tick_clock);
 
  private:
   ShelfButtonPressedMetricTracker* shelf_button_pressed_metric_tracker_;

diff --git a/ash/system/power/peripheral_battery_notifier.h b/ash/system/power/peripheral_battery_notifier.h
@@ -33,7 +33,9 @@ class ASH_EXPORT PeripheralBatteryNotifier
   PeripheralBatteryNotifier();
   ~PeripheralBatteryNotifier() override;
 
-  void set_testing_clock(base::TickClock* clock) { testing_clock_ = clock; }
+  void set_testing_clock(const base::TickClock* clock) {
+    testing_clock_ = clock;
+  }
 
   // chromeos::PowerManagerClient::Observer:
   void PeripheralBatteryStatusReceived(const std::string& path,
@@ -87,7 +89,7 @@ class ASH_EXPORT PeripheralBatteryNotifier
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
 
   // Used only for helping test. Not owned and can be nullptr.
-  base::TickClock* testing_clock_ = nullptr;
+  const base::TickClock* testing_clock_ = nullptr;
 
   std::unique_ptr<base::WeakPtrFactory<PeripheralBatteryNotifier>>
       weakptr_factory_;

diff --git a/ash/system/power/power_button_controller.h b/ash/system/power/power_button_controller.h
@@ -230,7 +230,7 @@ class ASH_EXPORT PowerButtonController
   LockStateController* lock_state_controller_;  // Not owned.
 
   // Time source for performed action times.
-  base::TickClock* tick_clock_;
+  const base::TickClock* tick_clock_;
 
   // Used to interact with the display.
   std::unique_ptr<PowerButtonDisplayController> display_controller_;

diff --git a/ash/system/power/power_button_controller_test_api.cc b/ash/system/power/power_button_controller_test_api.cc
@@ -84,7 +84,8 @@ void PowerButtonControllerTestApi::SetPowerButtonType(
   controller_->button_type_ = button_type;
 }
 
-void PowerButtonControllerTestApi::SetTickClock(base::TickClock* tick_clock) {
+void PowerButtonControllerTestApi::SetTickClock(
+    const base::TickClock* tick_clock) {
   DCHECK(tick_clock);
   controller_->tick_clock_ = tick_clock;
 

diff --git a/ash/system/power/power_button_controller_test_api.h b/ash/system/power/power_button_controller_test_api.h
@@ -65,7 +65,7 @@ class PowerButtonControllerTestApi {
 
   void SetPowerButtonType(PowerButtonController::ButtonType button_type);
 
-  void SetTickClock(base::TickClock* tick_clock);
+  void SetTickClock(const base::TickClock* tick_clock);
 
   void SetTurnScreenOffForTap(bool turn_screen_off_for_tap);
 

diff --git a/ash/system/power/power_button_display_controller.cc b/ash/system/power/power_button_display_controller.cc
@@ -31,7 +31,7 @@ bool IsTabletModeActive() {
 
 PowerButtonDisplayController::PowerButtonDisplayController(
     BacklightsForcedOffSetter* backlights_forced_off_setter,
-    base::TickClock* tick_clock)
+    const base::TickClock* tick_clock)
     : backlights_forced_off_setter_(backlights_forced_off_setter),
       backlights_forced_off_observer_(this),
       tick_clock_(tick_clock),

diff --git a/ash/system/power/power_button_display_controller.h b/ash/system/power/power_button_display_controller.h
@@ -36,7 +36,7 @@ class ASH_EXPORT PowerButtonDisplayController
  public:
   PowerButtonDisplayController(
       BacklightsForcedOffSetter* backlights_forced_off_setter,
-      base::TickClock* tick_clock);
+      const base::TickClock* tick_clock);
   ~PowerButtonDisplayController() override;
 
   bool IsScreenOn() const;
@@ -83,7 +83,7 @@ class ASH_EXPORT PowerButtonDisplayController
   bool send_accessibility_alert_on_backlights_forced_off_change_ = false;
 
   // Time source for performed action times.
-  base::TickClock* tick_clock_;  // Not owned.
+  const base::TickClock* tick_clock_;  // Not owned.
 
   // If set, the active request passed to |backlights_forced_off_setter_| in
   // order to force the backlights off.

diff --git a/ash/system/power/power_button_screenshot_controller.cc b/ash/system/power/power_button_screenshot_controller.cc
@@ -29,7 +29,7 @@ constexpr base::TimeDelta
     PowerButtonScreenshotController::kScreenshotChordDelay;
 
 PowerButtonScreenshotController::PowerButtonScreenshotController(
-    base::TickClock* tick_clock)
+    const base::TickClock* tick_clock)
     : tick_clock_(tick_clock) {
   DCHECK(tick_clock_);
   // Using prepend to make sure this event handler is put in front of

diff --git a/ash/system/power/power_button_screenshot_controller.h b/ash/system/power/power_button_screenshot_controller.h
@@ -29,7 +29,7 @@ class ASH_EXPORT PowerButtonScreenshotController : public ui::EventHandler {
   static constexpr base::TimeDelta kScreenshotChordDelay =
       base::TimeDelta::FromMilliseconds(150);
 
-  explicit PowerButtonScreenshotController(base::TickClock* tick_clock);
+  explicit PowerButtonScreenshotController(const base::TickClock* tick_clock);
   ~PowerButtonScreenshotController() override;
 
   // Returns true if power button event is consumed by |this|, otherwise false.
@@ -73,7 +73,7 @@ class ASH_EXPORT PowerButtonScreenshotController : public ui::EventHandler {
   base::OneShotTimer volume_down_timer_;
 
   // Time source for performed action times.
-  base::TickClock* tick_clock_;  // Not owned.
+  const base::TickClock* tick_clock_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(PowerButtonScreenshotController);
 };

diff --git a/ash/system/session/logout_confirmation_controller.cc b/ash/system/session/logout_confirmation_controller.cc
@@ -171,7 +171,8 @@ void LogoutConfirmationController::OnDialogClosed() {
   logout_timer_.Stop();
 }
 
-void LogoutConfirmationController::SetClockForTesting(base::TickClock* clock) {
+void LogoutConfirmationController::SetClockForTesting(
+    const base::TickClock* clock) {
   clock_ = clock;
 }
 

diff --git a/ash/system/session/logout_confirmation_controller.h b/ash/system/session/logout_confirmation_controller.h
@@ -37,7 +37,7 @@ class ASH_EXPORT LogoutConfirmationController : public SessionObserver {
   LogoutConfirmationController();
   ~LogoutConfirmationController() override;
 
-  base::TickClock* clock() const { return clock_; }
+  const base::TickClock* clock() const { return clock_; }
 
   // Shows a LogoutConfirmationDialog. If a confirmation dialog is already being
   // shown, it is closed and a new one opened if |logout_time| is earlier than
@@ -57,15 +57,15 @@ class ASH_EXPORT LogoutConfirmationController : public SessionObserver {
   // Overrides the internal clock for testing. This doesn't take the ownership
   // of the clock. |clock| must outlive the LogoutConfirmationController
   // instance.
-  void SetClockForTesting(base::TickClock* clock);
+  void SetClockForTesting(const base::TickClock* clock);
   void SetLogoutClosureForTesting(const base::Closure& logout_closure);
   LogoutConfirmationDialog* dialog_for_testing() const { return dialog_; }
 
  private:
   class LastWindowClosedObserver;
   std::unique_ptr<LastWindowClosedObserver> last_window_closed_observer_;
 
-  base::TickClock* clock_;
+  const base::TickClock* clock_;
   base::Closure logout_closure_;
 
   base::TimeTicks logout_time_;

diff --git a/ash/wm/tablet_mode/tablet_mode_controller.cc b/ash/wm/tablet_mode/tablet_mode_controller.cc
@@ -530,7 +530,8 @@ bool TabletModeController::CanUseUnstableLidAngle() const {
   return elapsed_time >= kUnstableLidAngleDuration;
 }
 
-void TabletModeController::SetTickClockForTest(base::TickClock* tick_clock) {
+void TabletModeController::SetTickClockForTest(
+    const base::TickClock* tick_clock) {
   DCHECK(tick_clock_);
   tick_clock_ = tick_clock;
 }

diff --git a/ash/wm/tablet_mode/tablet_mode_controller.h b/ash/wm/tablet_mode/tablet_mode_controller.h
@@ -151,7 +151,7 @@ class ASH_EXPORT TabletModeController
   // artificially and deterministically control the current time.
   // This does not take the ownership of the tick_clock. |tick_clock| must
   // outlive the TabletModeController instance.
-  void SetTickClockForTest(base::TickClock* tick_clock);
+  void SetTickClockForTest(const base::TickClock* tick_clock);
 
   // Detect hinge rotation from base and lid accelerometers and automatically
   // start / stop tablet mode.
@@ -226,7 +226,7 @@ class ASH_EXPORT TabletModeController
   base::TimeTicks first_unstable_lid_angle_time_;
 
   // Source for the current time in base::TimeTicks.
-  base::TickClock* tick_clock_;
+  const base::TickClock* tick_clock_;
 
   // Set when tablet mode switch is on. This is used to force tablet mode.
   bool tablet_mode_switch_is_on_ = false;

diff --git a/base/task_scheduler/delayed_task_manager.cc b/base/task_scheduler/delayed_task_manager.cc
@@ -14,7 +14,8 @@
 namespace base {
 namespace internal {
 
-DelayedTaskManager::DelayedTaskManager(std::unique_ptr<TickClock> tick_clock)
+DelayedTaskManager::DelayedTaskManager(
+    std::unique_ptr<const TickClock> tick_clock)
     : tick_clock_(std::move(tick_clock)) {
   DCHECK(tick_clock_);
 }

diff --git a/base/task_scheduler/delayed_task_manager.h b/base/task_scheduler/delayed_task_manager.h
@@ -36,7 +36,7 @@ class BASE_EXPORT DelayedTaskManager {
   using PostTaskNowCallback = OnceCallback<void(Task task)>;
 
   // |tick_clock| can be specified for testing.
-  DelayedTaskManager(std::unique_ptr<TickClock> tick_clock =
+  DelayedTaskManager(std::unique_ptr<const TickClock> tick_clock =
                          std::make_unique<DefaultTickClock>());
   ~DelayedTaskManager();
 
@@ -57,7 +57,7 @@ class BASE_EXPORT DelayedTaskManager {
                          TimeDelta delay,
                          PostTaskNowCallback post_task_now_callback);
 
-  const std::unique_ptr<TickClock> tick_clock_;
+  const std::unique_ptr<const TickClock> tick_clock_;
 
   AtomicFlag started_;
 

diff --git a/base/test/scoped_task_environment.cc b/base/test/scoped_task_environment.cc
@@ -244,7 +244,7 @@ void ScopedTaskEnvironment::FastForwardUntilNoTasksRemain() {
   mock_time_task_runner_->FastForwardUntilNoTasksRemain();
 }
 
-TickClock* ScopedTaskEnvironment::GetMockTickClock() {
+const TickClock* ScopedTaskEnvironment::GetMockTickClock() {
   DCHECK(mock_time_task_runner_);
   return mock_time_task_runner_->GetMockTickClock();
 }

diff --git a/base/test/scoped_task_environment.h b/base/test/scoped_task_environment.h
@@ -116,7 +116,7 @@ class ScopedTaskEnvironment {
 
   // Returns a TickClock whose time is updated by
   // FastForward(By|UntilNoTasksRemain).
-  TickClock* GetMockTickClock();
+  const TickClock* GetMockTickClock();
   std::unique_ptr<TickClock> DeprecatedGetMockTickClock();
 
  private:

diff --git a/base/test/scoped_task_environment_unittest.cc b/base/test/scoped_task_environment_unittest.cc
@@ -259,7 +259,8 @@ TEST_F(ScopedTaskEnvironmentTest, FastForwardAdvanceTickClock) {
   ThreadTaskRunnerHandle::Get()->PostDelayedTask(FROM_HERE, base::DoNothing(),
                                                  kLongTaskDelay);
 
-  base::TickClock* tick_clock = scoped_task_environment.GetMockTickClock();
+  const base::TickClock* tick_clock =
+      scoped_task_environment.GetMockTickClock();
   base::TimeTicks tick_clock_ref = tick_clock->NowTicks();
 
   // Make sure that |FastForwardBy| advances the clock.

diff --git a/base/test/test_mock_time_task_runner.cc b/base/test/test_mock_time_task_runner.cc
@@ -239,7 +239,7 @@ std::unique_ptr<TickClock> TestMockTimeTaskRunner::DeprecatedGetMockTickClock()
   return std::make_unique<LegacyMockTickClock>(this);
 }
 
-TickClock* TestMockTimeTaskRunner::GetMockTickClock() const {
+const TickClock* TestMockTimeTaskRunner::GetMockTickClock() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return &mock_clock_;
 }

diff --git a/base/test/test_mock_time_task_runner.h b/base/test/test_mock_time_task_runner.h
@@ -169,7 +169,7 @@ class TestMockTimeTaskRunner : public SingleThreadTaskRunner,
   // TODO(tzik): Replace Remove DeprecatedGetMockTickClock() after updating all
   // callers to use non-owning TickClock.
   std::unique_ptr<TickClock> DeprecatedGetMockTickClock() const;
-  TickClock* GetMockTickClock() const;
+  const TickClock* GetMockTickClock() const;
 
   base::circular_deque<TestPendingTask> TakePendingTasks();
   bool HasPendingTask() const;

diff --git a/base/time/default_tick_clock.cc b/base/time/default_tick_clock.cc
@@ -4,7 +4,7 @@
 
 #include "base/time/default_tick_clock.h"
 
-#include "base/lazy_instance.h"
+#include "base/no_destructor.h"
 
 namespace base {
 
@@ -15,10 +15,9 @@ TimeTicks DefaultTickClock::NowTicks() const {
 }
 
 // static
-DefaultTickClock* DefaultTickClock::GetInstance() {
-  static LazyInstance<DefaultTickClock>::Leaky instance =
-      LAZY_INSTANCE_INITIALIZER;
-  return instance.Pointer();
+const DefaultTickClock* DefaultTickClock::GetInstance() {
+  static const base::NoDestructor<DefaultTickClock> default_tick_clock;
+  return default_tick_clock.get();
 }
 
 }  // namespace base
diff --git a/base/time/default_tick_clock.h b/base/time/default_tick_clock.h
@@ -6,7 +6,6 @@
 #define BASE_TIME_DEFAULT_TICK_CLOCK_H_
 
 #include "base/base_export.h"
-#include "base/compiler_specific.h"
 #include "base/time/tick_clock.h"
 
 namespace base {
@@ -20,7 +19,7 @@ class BASE_EXPORT DefaultTickClock : public TickClock {
   TimeTicks NowTicks() const override;
 
   // Returns a shared instance of DefaultTickClock. This is thread-safe.
-  static DefaultTickClock* GetInstance();
+  static const DefaultTickClock* GetInstance();
 };
 
 }  // namespace base

diff --git a/base/timer/timer.cc b/base/timer/timer.cc
@@ -62,7 +62,9 @@ class BaseTimerTaskInternal {
 Timer::Timer(bool retain_user_task, bool is_repeating)
     : Timer(retain_user_task, is_repeating, nullptr) {}
 
-Timer::Timer(bool retain_user_task, bool is_repeating, TickClock* tick_clock)
+Timer::Timer(bool retain_user_task,
+             bool is_repeating,
+             const TickClock* tick_clock)
     : scheduled_task_(nullptr),
       is_repeating_(is_repeating),
       retain_user_task_(retain_user_task),
@@ -85,7 +87,7 @@ Timer::Timer(const Location& posted_from,
              TimeDelta delay,
              const base::Closure& user_task,
              bool is_repeating,
-             TickClock* tick_clock)
+             const TickClock* tick_clock)
     : scheduled_task_(nullptr),
       posted_from_(posted_from),
       delay_(delay),