Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(

1 files changed, 11 insertions, 46 deletions

diff --git a/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp b/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp
index ed13ffa58..a373c3b30 100644
--- a/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp
+++ b/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp
@@ -33,41 +33,15 @@
 
 #include "WebUserMediaClientMock.h"
 
-#include "MockConstraints.h"
 #include "WebDocument.h"
 #include "WebMediaStreamRegistry.h"
 #include "WebUserMediaRequest.h"
-#include <public/WebMediaConstraints.h>
-#include <public/WebMediaStreamDescriptor.h>
-#include <public/WebMediaStreamSource.h>
-#include <public/WebVector.h>
+#include "platform/WebMediaStreamDescriptor.h"
+#include "platform/WebMediaStreamSource.h"
+#include "platform/WebVector.h"
 #include <wtf/Assertions.h>
 
-using namespace WebKit;
-
-class UserMediaRequestTask : public MethodTask<WebUserMediaClientMock> {
-public:
-    UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebMediaStreamDescriptor result)
-        : MethodTask<WebUserMediaClientMock>(object)
-        , m_request(request)
-        , m_result(result)
-    {
-    }
-
-    virtual void runIfValid() OVERRIDE
-    {
-        if (m_result.isNull())
-            m_request.requestFailed();
-        else
-            m_request.requestSucceeded(m_result);
-    }
-
-private:
-    WebUserMediaRequest m_request;
-    WebMediaStreamDescriptor m_result;
-};
-
-////////////////////////////////
+namespace WebKit {
 
 class MockExtraData : public WebMediaStreamDescriptor::ExtraData {
 public:
@@ -85,18 +59,7 @@ void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamR
     WebUserMediaRequest request = streamRequest;
 
     if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
-        postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
-        return;
-    }
-
-    WebMediaConstraints constraints = request.audioConstraints();
-    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
-        postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
-        return;
-    }
-    constraints = request.videoConstraints();
-    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
-        postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
+        request.requestFailed();
         return;
     }
 
@@ -111,16 +74,18 @@ void WebUserMediaClientMock::requestUserMedia(const WebUserMediaRequest& streamR
     if (request.video())
         videoSources[0].initialize("MockVideoDevice#1", WebMediaStreamSource::TypeVideo, "Mock video device");
 
-    WebMediaStreamDescriptor stream;
-    stream.initialize("foobar", audioSources, videoSources);
+    WebKit::WebMediaStreamDescriptor descriptor;
+    descriptor.initialize("foobar", audioSources, videoSources);
 
-    stream.setExtraData(new MockExtraData());
+    descriptor.setExtraData(new MockExtraData());
 
-    postTask(new UserMediaRequestTask(this, request, stream));
+    request.requestSucceeded(descriptor);
 }
 
 void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&)
 {
 }
 
+} // namespace WebKit
+
 #endif // ENABLE(MEDIA_STREAM)