MediaStream API: Changing the device enumeration to be async

Source/core/platform/mediastream/MediaStreamCenter.cpp

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * 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.
@@ skipping 16 matching lines @@
  * 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/MediaStreamCenter.h"
 
 #include "core/platform/mediastream/MediaStreamDescriptor.h"
+#include "core/platform/mediastream/MediaStreamSourcesQueryClient.h"
+#include "modules/mediastream/MediaStreamTrackSourcesRequest.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebMediaStreamCenter.h"
 #include "public/platform/WebMediaStreamTrack.h"
+#include "public/platform/WebMediaStreamTrackSourcesRequest.h"
 #include "wtf/MainThread.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 MediaStreamCenter& MediaStreamCenter::instance()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ());
     return center;
 }
 
 MediaStreamCenter::MediaStreamCenter()
     : m_private(adoptPtr(WebKit::Platform::current()->createMediaStreamCenter(this)))
 {
 }
 
 MediaStreamCenter::~MediaStreamCenter()
 {
 }
 
-bool MediaStreamCenter::getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>& sourceInfos)
+bool MediaStreamCenter::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequest> request)
 {
-    return m_private && m_private->getSourceInfos(url, sourceInfos);
+    return m_private && m_private->getMediaStreamTrackSources(request);
 }
 
 void MediaStreamCenter::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream,  MediaStreamComponent* component)
 {
     if (m_private) {
         if (component->enabled())
             m_private->didEnableMediaStreamTrack(stream, component);
         else
             m_private->didDisableMediaStreamTrack(stream, component);
     }
@@ skipping 32 matching lines @@
 {
     MediaStreamDescriptor* stream = webStream;
     MediaStreamDescriptorClient* client = stream->client();
     if (client)
         client->streamEnded();
     else
         stream->setEnded();
 }
 
 } // namespace WebCore