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

third_party/WebKit/public/platform/WebMediaStreamSource.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebMediaStreamSource_h
 #define WebMediaStreamSource_h
 
 #include "WebCommon.h"
 #include "WebNonCopyable.h"
 #include "WebPrivatePtr.h"
 #include "WebVector.h"
-#if INSIDE_BLINK
-#include "platform/heap/Handle.h"
-#endif
 
 namespace blink {
 
 class MediaStreamSource;
 class WebAudioDestinationConsumer;
 class WebMediaConstraints;
 class WebString;
 
 class WebMediaStreamSource {
 public:
     class ExtraData {
     public:
         ExtraData() : m_owner(0) { }
         virtual ~ExtraData() { }
 
         BLINK_PLATFORM_EXPORT WebMediaStreamSource owner();
 
 #if INSIDE_BLINK
         BLINK_PLATFORM_EXPORT void setOwner(MediaStreamSource*);
 #endif
 
     private:
-#if INSIDE_BLINK
-        GC_PLUGIN_IGNORE("http://crbug.com/409526")
-#endif
         MediaStreamSource* m_owner;
     };
 
     enum Type {
         TypeAudio,
         TypeVideo
     };
 
     enum ReadyState {
         ReadyStateLive = 0,
@@ skipping 36 matching lines @@
     BLINK_PLATFORM_EXPORT WebMediaConstraints constraints();
 
     // Only used if if this is a WebAudio source.
     // The WebAudioDestinationConsumer is not owned, and has to be disposed of separately
     // after calling removeAudioConsumer.
     BLINK_PLATFORM_EXPORT bool requiresAudioConsumer() const;
     BLINK_PLATFORM_EXPORT void addAudioConsumer(WebAudioDestinationConsumer*);
     BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*);
 
 #if INSIDE_BLINK
-    BLINK_PLATFORM_EXPORT WebMediaStreamSource(MediaStreamSource*);
+    BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<MediaStreamSource>&);
     BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(MediaStreamSource*);
     BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamSource>() const;
     BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const;
 #endif
 
 private:
     WebPrivatePtr<MediaStreamSource> m_private;
 };
 
 } // namespace blink
 
 #endif // WebMediaStreamSource_h