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

webkit/media/webmediaplayer_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 "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 114 matching lines @@
       is_accelerated_compositing_active_(false),
       incremented_externally_allocated_memory_(false),
       audio_source_provider_(audio_source_provider) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
 
-bool WebMediaPlayerImpl::Initialize(
-    WebKit::WebFrame* frame,
-    bool use_simple_data_source) {
+void WebMediaPlayerImpl::Initialize(WebKit::WebFrame* frame) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   MessageLoop* pipeline_message_loop =
       message_loop_factory_->GetMessageLoop("PipelineThread");
-  if (!pipeline_message_loop) {
-    NOTREACHED() << "Could not start PipelineThread";
-    return false;
-  }
+  CHECK(pipeline_message_loop) << "Failed to create a new thread";
 
   // Let V8 know we started new thread if we did not did it yet.
   // Made separate task to avoid deletion of player currently being created.
   // Also, delaying GC until after player starts gets rid of starting lag --
   // collection happens in parallel with playing.
   // TODO(enal): remove when we get rid of per-audio-stream thread.
   if (!incremented_externally_allocated_memory_) {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory,
@@ skipping 33 matching lines @@
                                       proxy_->GetBuildObserver()));
 
   // A sophisticated data source that does memory caching.
   scoped_ptr<media::DataSourceFactory> buffered_data_source_factory(
       BufferedDataSource::CreateFactory(MessageLoop::current(), frame,
                                         media_log_,
                                         proxy_->GetBuildObserver()));
 
   scoped_ptr<media::CompositeDataSourceFactory> data_source_factory(
       new media::CompositeDataSourceFactory());
-
-  if (use_simple_data_source) {
-    data_source_factory->AddFactory(simple_data_source_factory.Pass());
-    data_source_factory->AddFactory(buffered_data_source_factory.Pass());
-  } else {
-    data_source_factory->AddFactory(buffered_data_source_factory.Pass());
-    data_source_factory->AddFactory(simple_data_source_factory.Pass());
-  }
+  data_source_factory->AddFactory(buffered_data_source_factory.Pass());
+  data_source_factory->AddFactory(simple_data_source_factory.Pass());
 
   scoped_ptr<media::DemuxerFactory> demuxer_factory(
       // TODO(fischman): replace the extra scoped_ptr+release() with Pass() when
       // http://crbug.com/109026 is fixed.
       new media::FFmpegDemuxerFactory(scoped_ptr<media::DataSourceFactory>(
           data_source_factory.release()), pipeline_message_loop));
 
   std::string source_url = GetClient()->sourceURL().spec();
 
   if (!source_url.empty()) {
     demuxer_factory.reset(
         new media::ChunkDemuxerFactory(source_url,
                                        demuxer_factory.Pass(),
                                        proxy_));
   }
   filter_collection_->SetDemuxerFactory(demuxer_factory.Pass());
 
   // Add in the default filter factories.
   filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder(
       message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
   filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder(
       message_loop_factory_->GetMessageLoop("VideoDecoderThread")));
   filter_collection_->AddAudioRenderer(new media::NullAudioRenderer());
-
-  return true;
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   Destroy();
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED));
 
   if (delegate_)
     delegate_->PlayerGone(this);
@@ skipping 703 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media