Merge 67824 - Stopgap fix for crash in issue 53867 comment 15...

webkit/glue/webmediaplayer_impl.h

Index: webkit/glue/webmediaplayer_impl.h
===================================================================
--- webkit/glue/webmediaplayer_impl.h	(revision 67852)
+++ webkit/glue/webmediaplayer_impl.h	(working copy)
@@ -169,14 +169,18 @@
   // |collection| can override the default filters by adding extra filters to
   // |collection| before calling this method.
   //
+  // Callers must call |Initialize()| before they can use the object.
   WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
-                     media::MediaFilterCollection* collection,
-                     MediaResourceLoaderBridgeFactory* bridge_factory_simple,
-                     MediaResourceLoaderBridgeFactory* bridge_factory_buffered,
-                     bool use_simple_data_source,
-                     scoped_refptr<WebVideoRenderer> web_video_renderer);
+                     media::MediaFilterCollection* collection);
   virtual ~WebMediaPlayerImpl();
 
+  // Finalizes initialization of the object.
+  bool Initialize(
+      MediaResourceLoaderBridgeFactory* bridge_factory_simple,
+      MediaResourceLoaderBridgeFactory* bridge_factory_buffered,
+      bool use_simple_data_source,
+      scoped_refptr<WebVideoRenderer> web_video_renderer);
+
   virtual void load(const WebKit::WebURL& url);
   virtual void cancelLoad();