Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp

 /*
  * Copyright (C) 2012, 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #if ENABLE(WEB_AUDIO)
 
 #include "modules/webaudio/MediaStreamAudioDestinationNode.h"
 
 #include "core/platform/UUID.h"
 #include "core/platform/mediastream/MediaStreamCenter.h"
 #include "core/platform/mediastream/RTCPeerConnectionHandler.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/webaudio/AudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
-#include "public/platform/WebMediaStream.h"
-#include "public/platform/WebMediaStreamSource.h"
-#include "public/platform/WebMediaStreamTrack.h"
 #include "wtf/Locker.h"
 
 namespace WebCore {
 
 PassRefPtr<MediaStreamAudioDestinationNode> MediaStreamAudioDestinationNode::create(AudioContext* context, size_t numberOfChannels)
 {
     return adoptRef(new MediaStreamAudioDestinationNode(context, numberOfChannels));
 }
 
 MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* context, size_t numberOfChannels)
     : AudioBasicInspectorNode(context, context->sampleRate(), numberOfChannels)
     , m_mixBus(AudioBus::create(numberOfChannels, ProcessingSizeInFrames))
 {
     ScriptWrappable::init(this);
     setNodeType(NodeTypeMediaStreamAudioDestination);
 
     m_source = MediaStreamSource::create(ASCIILiteral("WebAudio-") + createCanonicalUUIDString(), MediaStreamSource::TypeAudio, "MediaStreamAudioDestinationNode", MediaStreamSource::ReadyStateLive, true);
     MediaStreamSourceVector audioSources;
     audioSources.append(m_source);
     MediaStreamSourceVector videoSources;
-    WebKit::WebMediaStream webStream = WebKit::WebMediaStream(createCanonicalUUIDString(), audioSources, videoSources);
-    m_stream = MediaStream::create(context->scriptExecutionContext(), webStream);
-    MediaStreamCenter::instance().didCreateMediaStream(m_stream->webStream());
+    m_stream = MediaStream::create(context->scriptExecutionContext(), MediaStreamDescriptor::create(audioSources, videoSources));
+    MediaStreamCenter::instance().didCreateMediaStream(m_stream->descriptor());
 
     m_source->setAudioFormat(numberOfChannels, context->sampleRate());
 
     initialize();
 }
 
 MediaStreamSource* MediaStreamAudioDestinationNode::mediaStreamSource()
 {
     return m_source.get();
 }
 
 MediaStreamAudioDestinationNode::~MediaStreamAudioDestinationNode()
 {
     uninitialize();
 }
 
 void MediaStreamAudioDestinationNode::process(size_t numberOfFrames)
 {
     m_mixBus->copyFrom(*input(0)->bus());
     m_source->consumeAudio(m_mixBus.get(), numberOfFrames);
 }
 
 void MediaStreamAudioDestinationNode::reset()
 {
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)