| Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
 | 
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
 | 
| index d8a8e298027950e7df835fcc3d422acaca1ed244..acdf6c3741887fe8dc421c33bc4026554aa85dba 100644
 | 
| --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
 | 
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
 | 
| @@ -242,7 +242,7 @@ bool MediaKeys::sessionTypeSupported(WebEncryptedMediaSessionType sessionType)
 | 
|      return false;
 | 
|  }
 | 
|  
 | 
| -void MediaKeys::timerFired(Timer<MediaKeys>*)
 | 
| +void MediaKeys::timerFired(TimerBase*)
 | 
|  {
 | 
|      DCHECK(m_pendingActions.size());
 | 
|  
 | 
| 
 |