| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/message_loop.h" | 6 #include "base/message_loop.h" |
| 7 #include "media/base/composite_filter.h" | 7 #include "media/base/composite_filter.h" |
| 8 #include "media/base/mock_callback.h" | 8 #include "media/base/mock_callback.h" |
| 9 #include "media/base/mock_filter_host.h" | 9 #include "media/base/mock_filter_host.h" |
| 10 #include "media/base/mock_filters.h" | 10 #include "media/base/mock_filters.h" |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 | 389 |
| 390 EXPECT_TRUE(composite_->AddFilter(filter)); | 390 EXPECT_TRUE(composite_->AddFilter(filter)); |
| 391 EXPECT_TRUE(filter->host() != NULL); | 391 EXPECT_TRUE(filter->host() != NULL); |
| 392 composite_->RemoveFilter(filter); | 392 composite_->RemoveFilter(filter); |
| 393 EXPECT_TRUE(filter->host() == NULL); | 393 EXPECT_TRUE(filter->host() == NULL); |
| 394 } | 394 } |
| 395 | 395 |
| 396 class CompositeFilterDeathTest : public CompositeFilterTest {}; | 396 class CompositeFilterDeathTest : public CompositeFilterTest {}; |
| 397 | 397 |
| 398 // Test failure of RemoveFilter() on an unknown filter. | 398 // Test failure of RemoveFilter() on an unknown filter. |
| 399 TEST_F(CompositeFilterDeathTest, TestRemoveUnknownFilter) { | 399 // TODO(fischman): figure out why this is flaky. http://crbug.com/104579 |
| 400 TEST_F(CompositeFilterDeathTest, DISABLED_TestRemoveUnknownFilter) { |
| 400 composite_->set_host(mock_filter_host_.get()); | 401 composite_->set_host(mock_filter_host_.get()); |
| 401 // Remove unknown filter. | 402 // Remove unknown filter. |
| 402 scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>(); | 403 scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>(); |
| 403 EXPECT_DEATH(composite_->RemoveFilter(filter), ""); | 404 EXPECT_DEATH(composite_->RemoveFilter(filter), ""); |
| 404 } | 405 } |
| 405 | 406 |
| 406 TEST_F(CompositeFilterTest, TestPlay) { | 407 TEST_F(CompositeFilterTest, TestPlay) { |
| 407 InSequence sequence; | 408 InSequence sequence; |
| 408 | 409 |
| 409 SetupAndAdd2Filters(); | 410 SetupAndAdd2Filters(); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 793 NewExpectedStatusCB(PIPELINE_OK)); | 794 NewExpectedStatusCB(PIPELINE_OK)); |
| 794 | 795 |
| 795 // Issue a Play() and expect no errors. | 796 // Issue a Play() and expect no errors. |
| 796 composite_->Play(NewExpectedClosure()); | 797 composite_->Play(NewExpectedClosure()); |
| 797 | 798 |
| 798 // Issue a Stop() and expect no errors. | 799 // Issue a Stop() and expect no errors. |
| 799 composite_->Stop(NewExpectedClosure()); | 800 composite_->Stop(NewExpectedClosure()); |
| 800 } | 801 } |
| 801 | 802 |
| 802 } // namespace media | 803 } // namespace media |
| OLD | NEW |