Defer loading of audio/video tags while prerendering.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index aedf3d9a3612779893e504545255a7614cca5f37..cce08a24853c76e4d7cbc2ddd403319bb32b1c7d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1932,10 +1932,10 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
 
-  scoped_ptr<media::MessageLoopFactory> message_loop_factory(
-      new media::MessageLoopFactoryImpl());
-  scoped_ptr<media::FilterCollection> collection(
-      new media::FilterCollection());
+  media::MessageLoopFactory* message_loop_factory =
+      new media::MessageLoopFactoryImpl();
+  media::FilterCollection* collection = new media::FilterCollection();
+  RenderMediaLog* render_media_log = new RenderMediaLog();
 
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
@@ -1944,13 +1944,19 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     collection->AddAudioRenderer(new AudioRendererImpl());
   }
 
-  scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
-      new webkit_media::WebMediaPlayerImpl(client,
-                                          AsWeakPtr(),
-                                          collection.release(),
-                                          message_loop_factory.release(),
-                                          media_stream_impl_.get(),
-                                          new RenderMediaLog()));
+  webkit_media::WebMediaPlayerImpl* result_ptr;
+  if (!content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
+      this, client, AsWeakPtr(), collection, message_loop_factory,
+      media_stream_impl_.get(), render_media_log, &result_ptr)) {
+    result_ptr = new webkit_media::WebMediaPlayerImpl(
+        client, AsWeakPtr(), collection, message_loop_factory,
+        media_stream_impl_.get(), render_media_log);
+  }
+
+  DCHECK(result_ptr);
+  scoped_ptr<webkit_media::WebMediaPlayerImpl> result;
+  result.reset(result_ptr);
+
   if (!result->Initialize(frame,
                           cmd_line->HasSwitch(switches::kSimpleDataSource))) {
     return NULL;