Fold WebMediaPlayerImpl::Initialize() into the constructor.

OverrideCreateWebMediaPlayer() was simplified to return a pointer instead of relying on a bool+out-param since unlike OverrideCreatePlugin() we don't require blocking creation of media players.

BUG=109958


Review URL: http://codereview.chromium.org/9187045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117607 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h
index e0cdc87..eed6d0b 100644
--- a/content/shell/shell_content_renderer_client.h
+++ b/content/shell/shell_content_renderer_client.h
@@ -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.
 
@@ -31,16 +31,16 @@ class ShellContentRendererClient : public ContentRendererClient {
       const WebKit::WebURLError& error,
       std::string* error_html,
       string16* error_description) OVERRIDE;
-  virtual bool OverrideCreateWebMediaPlayer(
+  virtual webkit_media::WebMediaPlayerImpl* 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) OVERRIDE;
+      media::MediaLog* media_log) OVERRIDE;
   virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
   virtual bool AllowPopup(const GURL& creator) OVERRIDE;
   virtual bool ShouldFork(WebKit::WebFrame* frame,