Move Pipeline permanent callbacks into Pipeline::Client interface.

media/filters/pipeline_controller.cc

 // Copyright 2016 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 "media/filters/pipeline_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/demuxer.h"
@@ skipping 18 matching lines @@
   DCHECK(!suspended_cb_.is_null());
   DCHECK(!error_cb_.is_null());
 }
 
 PipelineController::~PipelineController() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 // TODO(sandersd): If there is a pending suspend, don't call pipeline_.Start()
 // until Resume().
-void PipelineController::Start(
-    Demuxer* demuxer,
-    bool is_streaming,
-    bool is_static,
-    const base::Closure& ended_cb,
-    const PipelineMetadataCB& metadata_cb,
-    const BufferingStateCB& buffering_state_cb,
-    const base::Closure& duration_change_cb,
-    const AddTextTrackCB& add_text_track_cb,
-    const base::Closure& waiting_for_decryption_key_cb) {
+void PipelineController::Start(Demuxer* demuxer,
+                               Pipeline::Client* client,
+                               bool is_streaming,
+                               bool is_static) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(state_ == State::CREATED);
   DCHECK(demuxer);
 
   // Once the pipeline is started, we want to call the seeked callback but
   // without a time update.
   pending_seeked_cb_ = true;
   state_ = State::STARTING;
 
   demuxer_ = demuxer;
   is_streaming_ = is_streaming;
   is_static_ = is_static;
-  pipeline_->Start(
-      demuxer, renderer_factory_cb_.Run(), ended_cb,
-      BindToCurrentLoop(error_cb_),
-      BindToCurrentLoop(base::Bind(&PipelineController::OnPipelineStatus,
-                                   weak_factory_.GetWeakPtr(), State::PLAYING)),
-      metadata_cb, buffering_state_cb, duration_change_cb, add_text_track_cb,
-      waiting_for_decryption_key_cb);
+  pipeline_->Start(demuxer, renderer_factory_cb_.Run(), client,
+                   BindToCurrentLoop(
+                       base::Bind(&PipelineController::OnPipelineStatus,
+                                  weak_factory_.GetWeakPtr(), State::PLAYING)));
 }
 
 void PipelineController::Seek(base::TimeDelta time, bool time_updated) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // It would be slightly more clear to set this in Dispatch(), but we want to
   // be sure it gets updated even if the seek is elided.
   if (time_updated)
     pending_time_updated_ = true;
   pending_seeked_cb_ = true;
@@ skipping 161 matching lines @@
       pending_seeked_cb_ = false;
       bool was_pending_time_updated = pending_time_updated_;
       pending_time_updated_ = false;
       seeked_cb_.Run(was_pending_time_updated);
       return;
     }
   }
 }
 
 }  // namespace media