Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
=================================================================== |
--- content/renderer/renderer_webkitplatformsupport_impl.cc (revision 125630) |
+++ content/renderer/renderer_webkitplatformsupport_impl.cc (working copy) |
@@ -38,8 +38,6 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" |
@@ -86,10 +84,6 @@ |
using WebKit::WebIDBKey; |
using WebKit::WebIDBKeyPath; |
using WebKit::WebKitPlatformSupport; |
-using WebKit::WebMediaStreamCenter; |
-using WebKit::WebMediaStreamCenterClient; |
-using WebKit::WebPeerConnectionHandler; |
-using WebKit::WebPeerConnectionHandlerClient; |
using WebKit::WebSerializedScriptValue; |
using WebKit::WebStorageArea; |
using WebKit::WebStorageEventDispatcher; |
@@ -654,9 +648,9 @@ |
//------------------------------------------------------------------------------ |
-WebPeerConnectionHandler* |
+WebKit::WebPeerConnectionHandler* |
RendererWebKitPlatformSupportImpl::createPeerConnectionHandler( |
- WebPeerConnectionHandlerClient* client) { |
+ WebKit::WebPeerConnectionHandlerClient* client) { |
WebFrame* web_frame = WebFrame::frameForCurrentContext(); |
if (!web_frame) |
return NULL; |
@@ -665,15 +659,3 @@ |
return NULL; |
return render_view->CreatePeerConnectionHandler(client); |
} |
- |
-//------------------------------------------------------------------------------ |
- |
-WebMediaStreamCenter* |
-RendererWebKitPlatformSupportImpl::createMediaStreamCenter( |
- WebMediaStreamCenterClient* client) { |
- RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
- DCHECK(render_thread); |
- if (!render_thread) |
- return NULL; |
- return render_thread->CreateMediaStreamCenter(client); |
-} |