Revert 68094 - Refactoring BufferedDataSource to work with WebURLLoader inste...

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2010 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/glue/webmediaplayer_impl.h"
 
 #include <limits>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 226 matching lines @@
       playback_rate_(0.0f),
       client_(client),
       proxy_(NULL),
       pipeline_stopped_(false, false) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
 }
 
 bool WebMediaPlayerImpl::Initialize(
-    WebKit::WebFrame* frame,
+    MediaResourceLoaderBridgeFactory* bridge_factory_simple,
+    MediaResourceLoaderBridgeFactory* bridge_factory_buffered,
     bool use_simple_data_source,
     scoped_refptr<WebVideoRenderer> web_video_renderer) {
   // Create the pipeline and its thread.
   if (!pipeline_thread_.Start()) {
     NOTREACHED() << "Could not start PipelineThread";
     return false;
   }
 
   pipeline_ = new media::PipelineImpl(pipeline_thread_.message_loop());
 
   // Also we want to be notified of |main_loop_| destruction.
   main_loop_->AddDestructionObserver(this);
 
   // Creates the proxy.
   proxy_ = new Proxy(main_loop_, this);
   web_video_renderer->SetWebMediaPlayerImplProxy(proxy_);
   proxy_->SetVideoRenderer(web_video_renderer);
 
   // Set our pipeline callbacks.
   pipeline_->Init(
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineEndedCallback),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineErrorCallback),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::NetworkEventCallback));
 
   // A simple data source that keeps all data in memory.
   scoped_refptr<SimpleDataSource> simple_data_source(
-    new SimpleDataSource(MessageLoop::current(), frame));
+      new SimpleDataSource(MessageLoop::current(), bridge_factory_simple));
 
   // A sophisticated data source that does memory caching.
   scoped_refptr<BufferedDataSource> buffered_data_source(
-      new BufferedDataSource(MessageLoop::current(), frame));
+      new BufferedDataSource(MessageLoop::current(), bridge_factory_buffered));
   proxy_->SetDataSource(buffered_data_source);
 
   if (use_simple_data_source) {
     filter_collection_->AddDataSource(simple_data_source);
     filter_collection_->AddDataSource(buffered_data_source);
   } else {
     filter_collection_->AddDataSource(buffered_data_source);
     filter_collection_->AddDataSource(simple_data_source);
   }
 
@@ skipping 509 matching lines @@
   pipeline_stopped_.Signal();
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue