Make chrome/browser/extensions use base::Clock instead of MockTimeProvider

chrome/browser/extensions/api/alarms/alarm_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_ALARMS_ALARM_MANAGER_H__
 #define CHROME_BROWSER_EXTENSIONS_API_ALARMS_ALARM_MANAGER_H__
 
 #include <string>
 #include <map>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/alarms.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
 
+namespace base {
+class Clock;
+}  // namespace base
+
 namespace extensions {
 
 class ExtensionAlarmsSchedulingTest;
 
 struct Alarm {
-  typedef base::Time (*TimeProvider)();
-
   Alarm();
   Alarm(const std::string& name,
         const api::alarms::AlarmCreateInfo& create_info,
         base::TimeDelta min_granularity,
-        TimeProvider now);
+        base::Time now);
   ~Alarm();
 
   linked_ptr<api::alarms::Alarm> js_alarm;
   // The granularity isn't exposed to the extension's javascript, but we poll at
   // least as often as the shortest alarm's granularity.  It's initialized as
   // the relative delay requested in creation, even if creation uses an absolute
   // time.  This will always be at least as large as the min_granularity
   // constructor argument.
   base::TimeDelta granularity;
 };
 
 // Manages the currently pending alarms for every extension in a profile.
 // There is one manager per virtual Profile.
 class AlarmManager
     : public content::NotificationObserver,
       public base::SupportsWeakPtr<AlarmManager> {
  public:
-  typedef base::Time (*TimeProvider)();
   typedef std::vector<Alarm> AlarmList;
 
   class Delegate {
    public:
     virtual ~Delegate() {}
     // Called when an alarm fires.
     virtual void OnAlarm(const std::string& extension_id,
                          const Alarm& alarm) = 0;
   };
 
-  // 'now' is usually &base::Time::Now.
-  explicit AlarmManager(Profile* profile, TimeProvider now);
+  // |clock| is usually a base::DefaultClock, but can be something
+  // else for testing.
+  explicit AlarmManager(Profile* profile, base::Clock* clock);
   virtual ~AlarmManager();
 
   // Override the default delegate. Callee assumes onwership. Used for testing.
   void set_delegate(Delegate* delegate) { delegate_.reset(delegate); }
 
   // Adds |alarm| for the given extension, and starts the timer.
   void AddAlarm(const std::string& extension_id,
                 const Alarm& alarm);
 
   // Returns the alarm with the given name, or NULL if none exists.
@@ skipping 55 matching lines @@
 
   // Polls the alarms, running any that have elapsed. After running them and
   // rescheduling repeating alarms, schedule the next poll.
   void PollAlarms();
 
   // NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  Profile* profile_;
-  const TimeProvider now_;
+  Profile* const profile_;
+  base::Clock* const clock_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<Delegate> delegate_;
 
   // The timer for this alarm manager.
   base::OneShotTimer<AlarmManager> timer_;
 
   // A map of our pending alarms, per extension.
   // Invariant: None of the AlarmLists are empty.
   AlarmMap alarms_;
 
   // The previous and next time that alarms were and will be run.
   base::Time last_poll_time_;
   base::Time next_poll_time_;
 
   DISALLOW_COPY_AND_ASSIGN(AlarmManager);
 };
 
 }  //  namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_ALARMS_ALARM_MANAGER_H__