Reduce repetitive EventTarget subclassing

Source/modules/mediastream/MediaStream.h

Index: Source/modules/mediastream/MediaStream.h
diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
index 631e71ead51ba1ce6b9fc797179587a20724bece..13213a529efe41f142e10ca94638a22e164af824 100644
--- a/Source/modules/mediastream/MediaStream.h
+++ b/Source/modules/mediastream/MediaStream.h
@@ -40,7 +40,7 @@ namespace WebCore {
 
 class ExceptionState;
 
-class MediaStream : public RefCounted<MediaStream>, public ScriptWrappable, public URLRegistrable, public MediaStreamDescriptorClient, public EventTarget, public ContextLifecycleObserver {
+class MediaStream : public RefCounted<MediaStream>, public ScriptWrappable, public URLRegistrable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextLifecycleObserver {
 public:
     static PassRefPtr<MediaStream> create(ScriptExecutionContext*);
     static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStream>);
@@ -86,10 +86,6 @@ public:
 protected:
     MediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
 
-    // EventTarget
-    virtual EventTargetData* eventTargetData() OVERRIDE;
-    virtual EventTargetData* ensureEventTargetData() OVERRIDE;
-
     // ContextLifecycleObserver
     virtual void contextDestroyed();
 
@@ -107,8 +103,6 @@ private:
 
     bool m_stopped;
 
-    EventTargetData m_eventTargetData;
-
     MediaStreamTrackVector m_audioTracks;
     MediaStreamTrackVector m_videoTracks;
     RefPtr<MediaStreamDescriptor> m_descriptor;