Remove --simple-data-source and convert WebMediaPlayerImpl::Initialize() to a void function.

webkit/media/webmediaplayer_impl.h

Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index b9600eca4de4a8b52d5c80a8a2900b02a31271be..63ce3f01d866c7e6028fe1794471b83fac83dfe4 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -86,24 +86,7 @@ class WebMediaPlayerImpl
   // Construct a WebMediaPlayerImpl with reference to the client, and media
   // filter collection. By providing the filter collection the implementor can
   // provide more specific media filters that does resource loading and
-  // rendering. |collection| should contain filter factories for:

[Ami GONE FROM CHROMIUM, 2012/01/12 03:10:35]

Why remove this chunk of comment?  At least parts of it seem worth keeping.

[scherkus (not reviewing), 2012/01/12 03:32:20]

Most of it is inaccurate -- I'll selectively add back a few parts.

-  // 1. Data source
-  // 2. Audio renderer
-  // 3. Video renderer (optional)
-  //
-  // There are some default filters provided by this method:
-  // 1. FFmpeg demuxer
-  // 2. FFmpeg audio decoder
-  // 3. FFmpeg video decoder
-  // 4. Video renderer
-  // 5. Null audio renderer
-  // The video renderer provided by this class is using the graphics context
-  // provided by WebKit to perform renderering. The simple data source does
-  // resource loading by loading the whole resource object into memory. Null
-  // audio renderer is a fake audio device that plays silence. Provider of the
-  // |collection| can override the default filters by adding extra filters to
-  // |collection| before calling this method.
-  // This object takes ownership of the |audio_source_provider|.
+  // rendering.
   //
   // Callers must call |Initialize()| before they can use the object.
   WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
@@ -115,8 +98,10 @@ class WebMediaPlayerImpl
                      media::MediaLog* media_log);
   virtual ~WebMediaPlayerImpl();
 
-  // Finalizes initialization of the object.
-  bool Initialize(WebKit::WebFrame* frame, bool use_simple_data_source);
+  // Finalizes initialization of the object using the given WebFrame.
+  //
+  // TODO(scherkus): fold this into the constructor http://crbug.com/109958
+  void Initialize(WebKit::WebFrame* frame);
 
   virtual void load(const WebKit::WebURL& url);
   virtual void cancelLoad();