Merge FilterStatusCB into PipelineStatusCB.

media/base/pipeline.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 "media/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 555 matching lines @@
       &Pipeline::InitializeTask, this, status));
 }
 
 // Called from any thread.
 void Pipeline::OnFilterStateTransition() {
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &Pipeline::FilterStateTransitionTask, this));
 }
 
 // Called from any thread.
-// This method makes the FilterStatusCB behave like a Closure. It
+// This method makes the PipelineStatusCB behave like a Closure. It
 // makes it look like a host()->SetError() call followed by a call to
 // OnFilterStateTransition() when errors occur.
 //
 // TODO: Revisit this code when SetError() is removed from FilterHost and
-//       all the Closures are converted to FilterStatusCB.
+//       all the Closures are converted to PipelineStatusCB.
 void Pipeline::OnFilterStateTransitionWithStatus(PipelineStatus status) {
   if (status != PIPELINE_OK)
     SetError(status);
   OnFilterStateTransition();
 }
 
 void Pipeline::OnTeardownStateTransition() {
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &Pipeline::TeardownStateTransitionTask, this));
 }
@@ skipping 825 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (!waiting_for_clock_update_)
     return;
 
   waiting_for_clock_update_ = false;
   clock_->Play();
 }
 
 }  // namespace media