Delta from the first fix.

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 <map>
 #include <queue>
 #include <string>
@@ skipping 197 matching lines @@
   base::OneShotTimer<AlarmManager> timer_;
 
   // A map of our pending alarms, per extension.
   // Invariant: None of the AlarmLists are empty.
   AlarmMap alarms_;
 
   // A map of actions waiting for alarm data to be synced from storage, per
   // extension.
   ReadyMap ready_actions_;
 
-  // The previous and next time that alarms were and will be run.
+  // The previous time that alarms were run.
   base::Time last_poll_time_;
-  base::Time next_poll_time_;
+
+  // Next poll's time. Used only by unit tests.
+  base::Time test_next_poll_time_;
 
   DISALLOW_COPY_AND_ASSIGN(AlarmManager);
 };
 
 }  //  namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_ALARMS_ALARM_MANAGER_H__