From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 7 May 2012 11:21:11 +0200
Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b
 (http://svn.webkit.org/repository/webkit/trunk@116286)

---
 Source/WebKit/chromium/src/UserMediaClientImpl.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'Source/WebKit/chromium/src/UserMediaClientImpl.cpp')

diff --git a/Source/WebKit/chromium/src/UserMediaClientImpl.cpp b/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
index 9c0bf58e1..ca8a98dcb 100644
--- a/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
+++ b/Source/WebKit/chromium/src/UserMediaClientImpl.cpp
@@ -58,12 +58,6 @@ void UserMediaClientImpl::requestUserMedia(PassRefPtr<UserMediaRequest> prpReque
     if (m_client) {
         RefPtr<UserMediaRequest> request = prpRequest;
 
-        // FIXME: Cleanup when the chromium code has switched to the split sources implementation.
-        MediaStreamSourceVector combinedSources;
-        combinedSources.append(audioSources);
-        combinedSources.append(videoSources);
-        m_client->requestUserMedia(PassRefPtr<UserMediaRequest>(request.get()), combinedSources);
-
         m_client->requestUserMedia(request.release(), audioSources, videoSources);
     }
 }
-- 
cgit v1.2.1