6 files changed, 0 insertions, 46 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 04f2a96..4cf9502 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2404,15 +2404,8 @@ WebSharedWorker* RenderViewImpl::createSharedWorker(
   }
 }
 
-// TODO(wjia): remove the version without url when WebKit change is done.
-// http://webk.it/91301.
 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
-  return createMediaPlayer(frame, client);
-}
-
-WebMediaPlayer* RenderViewImpl::createMediaPlayer(
-    WebFrame* frame, WebMediaPlayerClient* client) {
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
 
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index fd20832..0864788 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -533,9 +533,6 @@ class RenderViewImpl : public RenderWidget,
       const WebKit::WebString& name, unsigned long long documentId);
   virtual WebKit::WebMediaPlayer* createMediaPlayer(
       WebKit::WebFrame* frame,
-      WebKit::WebMediaPlayerClient* client);
-  virtual WebKit::WebMediaPlayer* createMediaPlayer(
-      WebKit::WebFrame* frame,
       const WebKit::WebURL& url,
       WebKit::WebMediaPlayerClient* client);
   virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 290567f..6b8c4e3 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -386,13 +386,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
     const WebURL& url,
     WebMediaPlayerClient* client,
     webkit_media::MediaStreamClient* media_stream_client) {
-  return CreateMediaPlayer(frame, client, media_stream_client);
-}
-
-WebKit::WebMediaPlayer* CreateMediaPlayer(
-    WebFrame* frame,
-    WebMediaPlayerClient* client,
-    webkit_media::MediaStreamClient* media_stream_client) {
 #if defined(OS_ANDROID)
   return new webkit_media::WebMediaPlayerAndroid(
       frame,
@@ -422,12 +415,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebFrame* frame,
-    WebMediaPlayerClient* client) {
-  return CreateMediaPlayer(frame, client, NULL);
-}
-
-WebKit::WebMediaPlayer* CreateMediaPlayer(
-    WebFrame* frame,
     const WebURL& url,
     WebMediaPlayerClient* client) {
   return CreateMediaPlayer(frame, url, client, NULL);
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index 7d86119..18244e2 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -75,14 +75,6 @@ WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport();
 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame,
                                    const WebKit::WebPluginParams& params);
 
-// TODO(wjia): remove this function after WebKit patch is landed.
-// http://webk.it/91301.
-// This is used by WebFrameClient::createMediaPlayer().
-WebKit::WebMediaPlayer* CreateMediaPlayer(
-    WebKit::WebFrame* frame,
-    WebKit::WebMediaPlayerClient* client,
-    webkit_media::MediaStreamClient* media_stream_client);
-
 // This is used by WebFrameClient::createMediaPlayer().
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebKit::WebFrame* frame,
@@ -90,12 +82,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebKit::WebMediaPlayerClient* client,
     webkit_media::MediaStreamClient* media_stream_client);
 
-// TODO(wjia): remove this function after WebKit patch is landed.
-// This is used by WebFrameClient::createMediaPlayer().
-WebKit::WebMediaPlayer* CreateMediaPlayer(
-    WebKit::WebFrame* frame,
-    WebKit::WebMediaPlayerClient* client);
-
 // This is used by WebFrameClient::createMediaPlayer().
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebKit::WebFrame* frame,
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 476e6ce..5d76ab2 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -629,15 +629,8 @@ WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame,
       frame, params, plugins.front().path, AsWeakPtr());
 }
 
-// TODO(wjia): remove the version without url when WebKit change is done.
-// http://webk.it/91301.
 WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
     WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
-  return createMediaPlayer(frame, client);
-}
-
-WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
-    WebFrame* frame, WebMediaPlayerClient* client) {
   scoped_ptr<media::MessageLoopFactory> message_loop_factory(
       new media::MessageLoopFactory());
 
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index cc018d9..a482801 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -165,8 +165,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
       WebKit::WebFrame*, const WebKit::WebPluginParams&);
   virtual WebKit::WebMediaPlayer* createMediaPlayer(
       WebKit::WebFrame*, const WebKit::WebURL&, WebKit::WebMediaPlayerClient*);
-  virtual WebKit::WebMediaPlayer* createMediaPlayer(
-      WebKit::WebFrame*, WebKit::WebMediaPlayerClient*);
   virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(
       WebKit::WebFrame*, WebKit::WebApplicationCacheHostClient*);
   virtual bool allowPlugins(WebKit::WebFrame* frame, bool enabled_per_settings);