| Index: components/gcm_driver/gcm_driver_desktop.cc | 
| diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc | 
| index e6d04f54db7fe172f7f8132a4f580316e999b37d..998f7df5513905aa829d5e77107bc46b5fa37725 100644 | 
| --- a/components/gcm_driver/gcm_driver_desktop.cc | 
| +++ b/components/gcm_driver/gcm_driver_desktop.cc | 
| @@ -25,7 +25,7 @@ | 
| #include "net/url_request/url_request_context_getter.h" | 
|  | 
| #if defined(OS_CHROMEOS) | 
| -#include "components/timers/alarm_timer.h" | 
| +#include "components/timers/alarm_timer_chromeos.h" | 
| #endif | 
|  | 
| namespace gcm { | 
| @@ -344,7 +344,7 @@ void GCMDriverDesktop::IOWorker::WakeFromSuspendForHeartbeat(bool wake) { | 
|  | 
| scoped_ptr<base::Timer> timer; | 
| if (wake) | 
| -    timer.reset(new timers::AlarmTimer(true, false)); | 
| +    timer.reset(new timers::SimpleAlarmTimer()); | 
| else | 
| timer.reset(new base::Timer(true, false)); | 
|  | 
|  |