summaryrefslogtreecommitdiffstats
path: root/content/renderer/mock_content_renderer_client.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/renderer/mock_content_renderer_client.cc')
-rw-r--r--content/renderer/mock_content_renderer_client.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/content/renderer/mock_content_renderer_client.cc b/content/renderer/mock_content_renderer_client.cc
index 5a50a0e..fe811cc 100644
--- a/content/renderer/mock_content_renderer_client.cc
+++ b/content/renderer/mock_content_renderer_client.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -42,17 +42,18 @@ bool MockContentRendererClient::HasErrorPage(int http_status_code,
return false;
}
-bool MockContentRendererClient::OverrideCreateWebMediaPlayer(
+webkit_media::WebMediaPlayerImpl*
+MockContentRendererClient::OverrideCreateWebMediaPlayer(
RenderView* render_view,
+ WebKit::WebFrame* frame,
WebKit::WebMediaPlayerClient* client,
base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
media::FilterCollection* collection,
WebKit::WebAudioSourceProvider* audio_source_provider,
media::MessageLoopFactory* message_loop_factory,
webkit_media::MediaStreamClient* media_stream_client,
- media::MediaLog* media_log,
- webkit_media::WebMediaPlayerImpl** player) {
- return false;
+ media::MediaLog* media_log) {
+ return NULL;
}
void MockContentRendererClient::GetNavigationErrorStrings(