1 files changed, 8 insertions, 28 deletions
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index ddbdc16..0f9e53e 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -8,8 +8,6 @@
 #ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
 
-#include "ResourceHandleClient.h"
-
 #include "webkit/glue/webmediaplayer.h"
 
 #if ENABLE(VIDEO)
@@ -23,10 +21,10 @@ namespace webkit_glue {
 
 class WebMediaPlayerDelegate;
 
-class WebMediaPlayerImpl : public WebMediaPlayer,
-                           WebCore::ResourceHandleClient {
-public:
-  WebMediaPlayerImpl(WebCore::MediaPlayerPrivate* media_player_private);
+class WebMediaPlayerImpl : public WebMediaPlayer {
+ public:
+  explicit WebMediaPlayerImpl(
+      WebCore::MediaPlayerPrivate* media_player_private);
 
   virtual ~WebMediaPlayerImpl();
 
@@ -36,7 +34,7 @@ public:
   virtual WebFrame* GetWebFrame();
   
   // Notify the media player about network state change.
-  virtual void NotifynetworkStateChange();
+  virtual void NotifyNetworkStateChange();
 
   // Notify the media player about ready state change.
   virtual void NotifyReadyStateChange();
@@ -50,33 +48,15 @@ public:
   // Tell the media player to repaint itself.
   virtual void Repaint();
 
-  // Load a media resource.
-  virtual void LoadMediaResource(const GURL& url);
-
-  // Cancel loading the media resource.
-  virtual void CancelLoad();
-
-  // ResourceHandleClient methods
-  void willSendRequest(WebCore::ResourceHandle* handle,
-                       WebCore::ResourceRequest& request,
-                       const WebCore::ResourceResponse&);
-  void didReceiveResponse(WebCore::ResourceHandle* handle,
-                          const WebCore::ResourceResponse& response);
-  void didReceiveData(WebCore::ResourceHandle* handle, const char *buffer,
-                      int length, int);
-  void didFinishLoading(WebCore::ResourceHandle* handle);
-  void didFail(WebCore::ResourceHandle* handle, const WebCore::ResourceError&);
-
-private:
+ private:
   WebCore::MediaPlayerPrivate* media_player_private_;
   WebMediaPlayerDelegate* delegate_;
-  RefPtr<WebCore::ResourceHandle> resource_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_glue
 
-#endif // ENABLE(VIDEO)
+#endif  // ENABLE(VIDEO)
 
-#endif // ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_H_
+#endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_H_