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

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 cffbbbab0d89449a088db9e5b98b2602a973acee..f002c82bccba6003dd87130d3e921098e5621868 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1968,25 +1968,18 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
   }
 #endif
 
-  webkit_media::WebMediaPlayerImpl* result_ptr;
+  webkit_media::WebMediaPlayerImpl* media_player = NULL;
   if (!content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
       this, client, AsWeakPtr(), collection, audio_source_provider,
       message_loop_factory, media_stream_impl_.get(), render_media_log,
-      &result_ptr)) {
-    result_ptr = new webkit_media::WebMediaPlayerImpl(
+      &media_player)) {
+    media_player = new webkit_media::WebMediaPlayerImpl(
         client, AsWeakPtr(), collection, audio_source_provider,
         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;
-  }
-  return result.release();
+  media_player->Initialize(frame);
+  return media_player;
 }
 
 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(