| Index: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp | 
| diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp | 
| index 76f30eb313fd0d02cbe4f209b9a845e8055d1b20..e37582703fa8c9a7e5f40755244b8f74032c2f81 100644 | 
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp | 
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp | 
| @@ -361,7 +361,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, | 
| Document& document) | 
| : HTMLElement(tagName, document), | 
| ActiveScriptWrappable(this), | 
| -      ActiveDOMObject(&document), | 
| +      SuspendableObject(&document), | 
| m_loadTimer(this, &HTMLMediaElement::loadTimerFired), | 
| m_progressEventTimer(this, &HTMLMediaElement::progressEventTimerFired), | 
| m_playbackProgressTimer(this, | 
| @@ -500,7 +500,7 @@ void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument) { | 
| // load event from within the destructor. | 
| oldDocument.decrementLoadEventDelayCount(); | 
|  | 
| -  ActiveDOMObject::didMoveToNewExecutionContext(&document()); | 
| +  SuspendableObject::didMoveToNewExecutionContext(&document()); | 
| HTMLElement::didMoveToNewDocument(oldDocument); | 
| } | 
|  | 
| @@ -3738,7 +3738,7 @@ DEFINE_TRACE(HTMLMediaElement) { | 
| this); | 
| Supplementable<HTMLMediaElement>::trace(visitor); | 
| HTMLElement::trace(visitor); | 
| -  ActiveDOMObject::trace(visitor); | 
| +  SuspendableObject::trace(visitor); | 
| } | 
|  | 
| DEFINE_TRACE_WRAPPERS(HTMLMediaElement) { | 
|  |