| Index: chrome/renderer/prerender/prerender_webmediaplayer.h
|
| diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_webmediaplayer.h
|
| index da0b4d39c66e62f9cd29532a93320dde6cab6887..ba60dcc4be99025ea83df3e592c4bf5fd99f1e38 100644
|
| --- a/chrome/renderer/prerender/prerender_webmediaplayer.h
|
| +++ b/chrome/renderer/prerender/prerender_webmediaplayer.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| -#include "webkit/renderer/media/webmediaplayer_impl.h"
|
| +#include "content/renderer/media/webmediaplayer_impl.h"
|
|
|
| namespace prerender {
|
|
|
| @@ -16,14 +16,14 @@ namespace prerender {
|
| // the loading of the media till the prerendered page is swapped in.
|
| class PrerenderWebMediaPlayer
|
| : public content::RenderViewObserver,
|
| - public webkit_media::WebMediaPlayerImpl {
|
| + public content::WebMediaPlayerImpl {
|
| public:
|
| PrerenderWebMediaPlayer(
|
| content::RenderView* render_view,
|
| WebKit::WebFrame* frame,
|
| WebKit::WebMediaPlayerClient* client,
|
| - base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
|
| - const webkit_media::WebMediaPlayerParams& params);
|
| + base::WeakPtr<content::WebMediaPlayerDelegate> delegate,
|
| + const content::WebMediaPlayerParams& params);
|
| virtual ~PrerenderWebMediaPlayer();
|
|
|
| // WebMediaPlayerImpl methods:
|
|
|