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

content/renderer/render_view_impl.cc

 // 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.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1950 matching lines @@
         RenderThreadImpl::current()->EstablishGpuChannelSync(
             content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
     collection->AddVideoDecoder(new media::GpuVideoDecoder(
         MessageLoop::current(),
         scoped_ptr<media::GpuVideoDecoder::Factories>(
             new RendererGpuVideoDecoderFactories(
                 gpu_channel_host, context3d->context()->AsWeakPtr()))));
   }
 #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();
+  DCHECK(media_player);
+  media_player->Initialize(frame);
+  return media_player;
 }
 
 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
   if (!frame || !frame->view())
     return NULL;
   return new RendererWebApplicationCacheHostImpl(
       FromWebView(frame->view()), client,
       RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
 }
@@ skipping 2821 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
 #endif
 }