Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor

Source/modules/mediastream/MediaStream.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 26 matching lines @@
 
 class ExceptionState;
 
 class MediaStream FINAL
     : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>
     , public URLRegistrable
     , public MediaStreamDescriptorClient
     , public EventTargetWithInlineData
     , public ContextLifecycleObserver {
     DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>);
-    USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
 public:
     static MediaStream* create(ExecutionContext*);
     static MediaStream* create(ExecutionContext*, MediaStream*);
     static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&);
-    static MediaStream* create(ExecutionContext*, MediaStreamDescriptor*);
+    static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     virtual ~MediaStream();
 
     // DEPRECATED
     String label() const { return m_descriptor->id(); }
 
     String id() const { return m_descriptor->id(); }
 
     void addTrack(MediaStreamTrack*, ExceptionState&);
     void removeTrack(MediaStreamTrack*, ExceptionState&);
     MediaStreamTrack* getTrackById(String);
@@ skipping 20 matching lines @@
     // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
     // URLRegistrable
     virtual URLRegistry& registry() const OVERRIDE;
 
     virtual void trace(Visitor*) OVERRIDE;
 
 private:
-    MediaStream(ExecutionContext*, MediaStreamDescriptor*);
+    MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
 
     // ContextLifecycleObserver
     virtual void contextDestroyed() OVERRIDE;
 
     // MediaStreamDescriptorClient
     virtual void addRemoteTrack(MediaStreamComponent*) OVERRIDE;
     virtual void removeRemoteTrack(MediaStreamComponent*) OVERRIDE;
 
     void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
     void scheduledEventTimerFired(Timer<MediaStream>*);
 
     bool m_stopped;
 
     MediaStreamTrackVector m_audioTracks;
     MediaStreamTrackVector m_videoTracks;
-    Member<MediaStreamDescriptor> m_descriptor;
+    RefPtr<MediaStreamDescriptor> m_descriptor;
 
     Timer<MediaStream> m_scheduledEventTimer;
     WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
 };
 
 typedef HeapVector<Member<MediaStream> > MediaStreamVector;
 
 } // namespace blink
 
 #endif // MediaStream_h