Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.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:
  *
  *     * 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "core/platform/mediastream/chromium/MediaStreamCenterChromium.h"
 
-#include "core/platform/mediastream/MediaStreamComponent.h"
+#include "core/platform/mediastream/MediaStreamDescriptor.h"
 #include "core/platform/mediastream/MediaStreamSourcesQueryClient.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebMediaStreamCenter.h"
 #include "public/platform/WebMediaStreamSourcesRequest.h"
 #include "public/platform/WebMediaStreamTrack.h"
 #include "wtf/MainThread.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
@@ skipping 22 matching lines @@
         MediaStreamSourceVector audioSources, videoSources;
         client->didCompleteQuery(audioSources, videoSources);
     }
 }
 
 bool MediaStreamCenterChromium::getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>& sourceInfos)
 {
     return m_private && m_private->getSourceInfos(url, sourceInfos);
 }
 
-void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(WebKit::WebMediaStream stream,  MediaStreamComponent* component)
+void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream,  MediaStreamComponent* component)
 {
     if (m_private) {
         if (component->enabled())
             m_private->didEnableMediaStreamTrack(stream, component);
         else
             m_private->didDisableMediaStreamTrack(stream, component);
     }
 }
 
-bool MediaStreamCenterChromium::didAddMediaStreamTrack(WebKit::WebMediaStream stream, MediaStreamComponent* component)
+bool MediaStreamCenterChromium::didAddMediaStreamTrack(MediaStreamDescriptor* stream, MediaStreamComponent* component)
 {
     return m_private && m_private->didAddMediaStreamTrack(stream, component);
 }
 
-bool MediaStreamCenterChromium::didRemoveMediaStreamTrack(WebKit::WebMediaStream stream, MediaStreamComponent* component)
+bool MediaStreamCenterChromium::didRemoveMediaStreamTrack(MediaStreamDescriptor* stream, MediaStreamComponent* component)
 {
     return m_private && m_private->didRemoveMediaStreamTrack(stream, component);
 }
 
-void MediaStreamCenterChromium::didStopLocalMediaStream(WebKit::WebMediaStream stream)
+void MediaStreamCenterChromium::didStopLocalMediaStream(MediaStreamDescriptor* stream)
 {
     if (m_private) {
         m_private->didStopLocalMediaStream(stream);
-        for (unsigned i = 0; i < stream.numberOfAudioComponents(); i++)
-            stream.audioComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
-        for (unsigned i = 0; i < stream.numberOfVideoComponents(); i++)
-            stream.videoComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
+        for (unsigned i = 0; i < stream->numberOfAudioComponents(); i++)
+            stream->audioComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
+        for (unsigned i = 0; i < stream->numberOfVideoComponents(); i++)
+            stream->videoComponent(i)->source()->setReadyState(MediaStreamSource::ReadyStateEnded);
     }
 }
 
-void MediaStreamCenterChromium::didCreateMediaStream(WebKit::WebMediaStream stream)
+void MediaStreamCenterChromium::didCreateMediaStream(MediaStreamDescriptor* stream)
 {
     if (m_private) {
         WebKit::WebMediaStream webStream(stream);
         m_private->didCreateMediaStream(webStream);
     }
 }
 
-void MediaStreamCenterChromium::stopLocalMediaStream(WebKit::WebMediaStream stream)
+void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStream& stream)
 {
     endLocalMediaStream(stream);
 }
 
 } // namespace WebCore