diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 20:46:46 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 20:46:46 +0000 |
commit | b572562659e2b46d99ee2a049e57f5d3dd28e0a7 (patch) | |
tree | b9bd76097d46ca3073528c5d30c42446963c21b6 /media/base/pipeline_impl_unittest.cc | |
parent | 2e6707f57abfe9a98bf5d9c931defc2efd12e483 (diff) | |
download | chromium_src-b572562659e2b46d99ee2a049e57f5d3dd28e0a7.zip chromium_src-b572562659e2b46d99ee2a049e57f5d3dd28e0a7.tar.gz chromium_src-b572562659e2b46d99ee2a049e57f5d3dd28e0a7.tar.bz2 |
Revert "Pipeline will execute a callback whenever an run-time error has happened."
TBR=kylep
Review URL: http://codereview.chromium.org/160287
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl_unittest.cc')
-rw-r--r-- | media/base/pipeline_impl_unittest.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index 6913cdc..e745761 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc @@ -32,7 +32,6 @@ class CallbackHelper { MOCK_METHOD0(OnStart, void()); MOCK_METHOD0(OnSeek, void()); MOCK_METHOD0(OnStop, void()); - MOCK_METHOD0(OnError, void()); private: DISALLOW_COPY_AND_ASSIGN(CallbackHelper); @@ -49,9 +48,6 @@ class PipelineImplTest : public ::testing::Test { PipelineImplTest() : pipeline_(new PipelineImpl(&message_loop_)), mocks_(new MockFilterFactory()) { - pipeline_->SetPipelineErrorCallback(NewCallback( - reinterpret_cast<CallbackHelper*>(&callbacks_), - &CallbackHelper::OnError)); } virtual ~PipelineImplTest() { @@ -236,7 +232,6 @@ TEST_F(PipelineImplTest, NeverInitializes) { } TEST_F(PipelineImplTest, RequiredFilterMissing) { - EXPECT_CALL(callbacks_, OnError()); mocks_->set_creation_successful(false); InitializePipeline(); @@ -250,7 +245,6 @@ TEST_F(PipelineImplTest, URLNotFound) { .WillOnce(DoAll(SetError(mocks_->data_source(), PIPELINE_ERROR_URL_NOT_FOUND), Invoke(&RunFilterCallback))); - EXPECT_CALL(callbacks_, OnError()); EXPECT_CALL(*mocks_->data_source(), Stop()); InitializePipeline(); @@ -270,7 +264,6 @@ TEST_F(PipelineImplTest, NoStreams) { EXPECT_CALL(*mocks_->demuxer(), GetNumberOfStreams()) .WillRepeatedly(Return(0)); EXPECT_CALL(*mocks_->demuxer(), Stop()); - EXPECT_CALL(callbacks_, OnError()); InitializePipeline(); EXPECT_FALSE(pipeline_->IsInitialized()); |