Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/MediaStreamTrack.cpp

 /*
  * 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 10 matching lines @@
  * 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 "modules/mediastream/MediaStreamTrack.h"
 
 #include "core/dom/Event.h"
 #include "core/dom/ScriptExecutionContext.h"
-#include "core/platform/chromium/support/WebMediaStreamClient.h"
 #include "core/platform/mediastream/MediaStreamCenter.h"
 #include "core/platform/mediastream/MediaStreamComponent.h"
 #include "public/platform/WebSourceInfo.h"
 #include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, MediaStreamComponent* component)
 {
     RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, component));
@@ skipping 46 matching lines @@
     return m_component->enabled();
 }
 
 void MediaStreamTrack::setEnabled(bool enabled)
 {
     if (m_stopped || enabled == m_component->enabled())
         return;
 
     m_component->setEnabled(enabled);
 
-    if (m_component->stream().ended())
+    if (m_component->stream()->ended())
         return;
 
     MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_component->stream(), m_component.get());
 }
 
 String MediaStreamTrack::readyState() const
 {
     if (m_stopped)
         return ASCIILiteral("ended");
 
@@ skipping 45 matching lines @@
         break;
     case MediaStreamSource::ReadyStateEnded:
         dispatchEvent(Event::create(eventNames().endedEvent, false, false));
         didEndTrack();
         break;
     }
 }
 
 void MediaStreamTrack::didEndTrack()
 {
-    WebKit::WebMediaStreamClient* client = m_component->stream().client();
+    MediaStreamDescriptorClient* client = m_component->stream()->client();
     if (!client)
         return;
 
     client->trackEnded();
 }
 
 MediaStreamComponent* MediaStreamTrack::component()
 {
     return m_component.get();
 }
@@ skipping 17 matching lines @@
 {
     return &m_eventTargetData;
 }
 
 EventTargetData* MediaStreamTrack::ensureEventTargetData()
 {
     return &m_eventTargetData;
 }
 
 } // namespace WebCore