Merge FilterStatusCB into PipelineStatusCB.

media/base/composite_filter_unittest.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 "base/bind.h"
 #include "base/message_loop.h"
 #include "media/base/composite_filter.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
@@ skipping 36 matching lines @@
                         base::TimeDelta seek_time);
 
   // Helper method that calls a filter method based on the value of
   // |method_to_call|.
   //
   // |method_to_call| - Indicates which method to call.
   // |filter| - The Filter to make the method call on.
   // |seek_time| - The time to pass to the Seek() call if |method_to_call|
   //               equals SEEK.
   // |callback| - The callback object to pass to the method.
-  // |expected_status| - Some filter methods use a FilterStatusCB instead of
+  // |expected_status| - Some filter methods use a PipelineStatusCB instead of
   //                     a Closure. For these methods this function
-  //                     creates a FilterStatusCB that makes sure the status
+  //                     creates a PipelineStatusCB that makes sure the status
   //                     passed to the callback matches |expected_status| and
   //                     then calls |callback|.
   void DoFilterCall(MethodToCall method_to_call, Filter* filter,
                     base::TimeDelta seek_time,
                     const base::Closure& callback,
                     PipelineStatus expected_status);
 
   // Creates an expectation sequence based on the value of method_to_call.
   //
   // |method_to_call| - Indicates which method we want a success sequence for.
@@ skipping 41 matching lines @@
   scoped_refptr<StrictMock<MockFilter> > filter_1_;
 
   // Callback passed to |filter_1_| during last Play(), Pause(), Flush(),
   // or Stop() call.
   base::Closure filter_1_cb_;
 
   // Status to pass to |filter_1_status_cb_|.
   PipelineStatus filter_1_status_;
 
   // Callback passed to |filter_1_| during last Seek() call.
-  FilterStatusCB filter_1_status_cb_;
+  PipelineStatusCB filter_1_status_cb_;
 
   // Second filter added to the composite.
   scoped_refptr<StrictMock<MockFilter> > filter_2_;
 
   // Callback passed to |filter_2_| during last Play(), Pause(), Flush(),
   // Stop(), or Seek() call.
   base::Closure filter_2_cb_;
 
   // Status to pass to |filter_2_status_cb_|.
   PipelineStatus filter_2_status_;
 
   // Callback passed to |filter_2_| during last Seek() call.
-  FilterStatusCB filter_2_status_cb_;
+  PipelineStatusCB filter_2_status_cb_;
 
   // FilterHost implementation passed to |composite_| via set_host().
   scoped_ptr<StrictMock<MockFilterHost> > mock_filter_host_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositeFilterTest);
 };
 
 CompositeFilterTest::CompositeFilterTest() :
     composite_(new CompositeFilter(&message_loop_)),
     filter_1_status_(PIPELINE_OK),
@@ skipping 643 matching lines @@
                    NewExpectedStatusCB(PIPELINE_OK));
 
   // Issue a Play() and expect no errors.
   composite_->Play(NewExpectedClosure());
 
   // Issue a Stop() and expect no errors.
   composite_->Stop(NewExpectedClosure());
 }
 
 }  // namespace media