summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 17:51:56 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 17:51:56 +0000
commitcec4eb8eb2fe3c19376d26d52ad85cb98d949fae (patch)
tree6e5d9b01bbea404d54ae714881990c83d4c85fae /webkit/tools
parent262b51025f77a5f72c9b07614cbb730966d8ccd3 (diff)
downloadchromium_src-cec4eb8eb2fe3c19376d26d52ad85cb98d949fae.zip
chromium_src-cec4eb8eb2fe3c19376d26d52ad85cb98d949fae.tar.gz
chromium_src-cec4eb8eb2fe3c19376d26d52ad85cb98d949fae.tar.bz2
Remove --simple-data-source and convert WebMediaPlayerImpl::Initialize() to a void function.
This is a step in removing WebMediaPlayerImpl::Initialize() entirely. BUG=109958 Review URL: http://codereview.chromium.org/9195001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 412fbd3..13b84849 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -647,7 +647,7 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
scoped_ptr<media::FilterCollection> collection(
new media::FilterCollection());
- scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+ webkit_media::WebMediaPlayerImpl* media_player =
new webkit_media::WebMediaPlayerImpl(
client,
base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
@@ -655,11 +655,9 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
NULL,
message_loop_factory.release(),
NULL,
- new media::MediaLog()));
- if (!result->Initialize(frame, false)) {
- return NULL;
- }
- return result.release();
+ new media::MediaLog());
+ media_player->Initialize(frame);
+ return media_player;
}
WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost(