| Index: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp | 
| diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp | 
| index 8610aa3bd54f4b75c8e546077a2afaae8f3e6a83..662424315078a992c6b16eaf93a38ce3f8fb7859 100644 | 
| --- a/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp | 
| +++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp | 
| @@ -219,7 +219,7 @@ const char* DOMWebSocket::subprotocolSeperator() { | 
|  | 
| DOMWebSocket::DOMWebSocket(ExecutionContext* context) | 
| : ActiveScriptWrappable(this), | 
| -      ActiveDOMObject(context), | 
| +      SuspendableObject(context), | 
| m_state(kConnecting), | 
| m_bufferedAmount(0), | 
| m_consumedBufferedAmount(0), | 
| @@ -650,7 +650,7 @@ const AtomicString& DOMWebSocket::interfaceName() const { | 
| } | 
|  | 
| ExecutionContext* DOMWebSocket::getExecutionContext() const { | 
| -  return ActiveDOMObject::getExecutionContext(); | 
| +  return SuspendableObject::getExecutionContext(); | 
| } | 
|  | 
| void DOMWebSocket::contextDestroyed() { | 
| @@ -863,7 +863,7 @@ DEFINE_TRACE(DOMWebSocket) { | 
| visitor->trace(m_eventQueue); | 
| WebSocketChannelClient::trace(visitor); | 
| EventTargetWithInlineData::trace(visitor); | 
| -  ActiveDOMObject::trace(visitor); | 
| +  SuspendableObject::trace(visitor); | 
| } | 
|  | 
| }  // namespace blink | 
|  |