Revert of [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp

Index: third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
index c7032fd2804faa17563805484d8fd9e2cea1ea8f..3e7e71b7d0e26950867ea632d51cdce210055476 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
@@ -37,22 +37,22 @@
 
 namespace blink {
 
-MediaStreamDescriptor* MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
+PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
-    return new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources);
+    return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources));
 }
 
-MediaStreamDescriptor* MediaStreamDescriptor::create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
+PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
 {
-    return new MediaStreamDescriptor(createCanonicalUUIDString(), audioComponents, videoComponents);
+    return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioComponents, videoComponents));
 }
 
-MediaStreamDescriptor* MediaStreamDescriptor::create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
+PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
 {
-    return new MediaStreamDescriptor(id, audioComponents, videoComponents);
+    return adoptRef(new MediaStreamDescriptor(id, audioComponents, videoComponents));
 }
 
-void MediaStreamDescriptor::addComponent(MediaStreamComponent* component)
+void MediaStreamDescriptor::addComponent(PassRefPtr<MediaStreamComponent> component)
 {
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
@@ -66,7 +66,7 @@
     }
 }
 
-void MediaStreamDescriptor::removeComponent(MediaStreamComponent* component)
+void MediaStreamDescriptor::removeComponent(PassRefPtr<MediaStreamComponent> component)
 {
     size_t pos = kNotFound;
     switch (component->source()->type()) {
@@ -100,7 +100,7 @@
 }
 
 MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
-    : m_client(nullptr)
+    : m_client(0)
     , m_id(id)
     , m_active(true)
     , m_ended(false)
@@ -114,7 +114,7 @@
 }
 
 MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
-    : m_client(nullptr)
+    : m_client(0)
     , m_id(id)
     , m_active(true)
     , m_ended(false)
@@ -126,11 +126,5 @@
         m_videoComponents.append((*iter));
 }
 
-DEFINE_TRACE(MediaStreamDescriptor)
-{
-    visitor->trace(m_audioComponents);
-    visitor->trace(m_videoComponents);
-    visitor->trace(m_client);
-}
+} // namespace blink
 
-} // namespace blink