Migrate Pipeline & PipelineImpl to PipelineStatusCB.

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/callback.h"
@@ skipping 346 matching lines @@
   // 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));
+      base::Bind(&WebMediaPlayerImpl::Proxy::PipelineEndedCallback,
+                 proxy_.get()),
+      base::Bind(&WebMediaPlayerImpl::Proxy::PipelineErrorCallback,
+                 proxy_.get()),
+      base::Bind(&WebMediaPlayerImpl::Proxy::NetworkEventCallback,
+                 proxy_.get()));
 
   // A simple data source that keeps all data in memory.
   scoped_ptr<media::DataSourceFactory> simple_data_source_factory(
       SimpleDataSource::CreateFactory(MessageLoop::current(), frame,
                                       proxy_->GetBuildObserver()));
 
   // A sophisticated data source that does memory caching.
   scoped_ptr<media::DataSourceFactory> buffered_data_source_factory(
       BufferedDataSource::CreateFactory(MessageLoop::current(), frame,
                                         proxy_->GetBuildObserver()));
@@ skipping 71 matching lines @@
   setVolume(GetClient()->volume());
   // Get the preload value.
   setPreload(GetClient()->preload());
 
   // Initialize the pipeline.
   SetNetworkState(WebKit::WebMediaPlayer::Loading);
   SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
   pipeline_->Start(
       filter_collection_.release(),
       url.spec(),
-      NewCallback(proxy_.get(),
-                  &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback));
+      base::Bind(&WebMediaPlayerImpl::Proxy::PipelineInitializationCallback,
+                 proxy_.get()));
 
   media_log_->Load(url.spec());
 }
 
 void WebMediaPlayerImpl::cancelLoad() {
   DCHECK(MessageLoop::current() == main_loop_);
 }
 
 void WebMediaPlayerImpl::play() {
   DCHECK(MessageLoop::current() == main_loop_);
@@ skipping 46 matching lines @@
     paused_time_ = seek_time;
   }
 
   seeking_ = true;
 
   proxy_->DemuxerFlush();
 
   // Kick off the asynchronous seek!
   pipeline_->Seek(
       seek_time,
-      NewCallback(proxy_.get(),
-                  &WebMediaPlayerImpl::Proxy::PipelineSeekCallback));
+      base::Bind(&WebMediaPlayerImpl::Proxy::PipelineSeekCallback,
+                 proxy_.get()));
 }
 
 void WebMediaPlayerImpl::setEndTime(float seconds) {
   DCHECK(MessageLoop::current() == main_loop_);
 
   // TODO(hclam): add method call when it has been implemented.
   return;
 }
 
 void WebMediaPlayerImpl::setRate(float rate) {
@@ skipping 499 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue