Revert 113895 - <video> decode in hardware!

media/base/composite_filter_unittest.cc

Index: media/base/composite_filter_unittest.cc
===================================================================
--- media/base/composite_filter_unittest.cc	(revision 113907)
+++ media/base/composite_filter_unittest.cc	(working copy)
@@ -379,8 +379,8 @@
   EXPECT_FALSE(composite_->AddFilter(filter));
 }
 
-// Test successful {Add,Remove}Filter() cases.
-TEST_F(CompositeFilterTest, TestAddRemoveFilter) {
+// Test successful AddFilter() cases.
+TEST_F(CompositeFilterTest, TestAddFilter) {
   composite_->set_host(mock_filter_host_.get());
 
   // Add a filter.
@@ -388,22 +388,10 @@
   EXPECT_EQ(NULL, filter->host());
 
   EXPECT_TRUE(composite_->AddFilter(filter));
-  EXPECT_TRUE(filter->host() != NULL);
 
-  composite_->RemoveFilter(filter);
-  EXPECT_TRUE(filter->host() == NULL);
+  EXPECT_TRUE(filter->host() != NULL);
 }
 
-class CompositeFilterDeathTest : public CompositeFilterTest {};
-
-// Test failure of RemoveFilter() on an unknown filter.
-TEST_F(CompositeFilterDeathTest, TestRemoveUnknownFilter) {
-  composite_->set_host(mock_filter_host_.get());
-  // Remove unknown filter.
-  scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>();
-  EXPECT_DEATH(composite_->RemoveFilter(filter), "");
-}
-
 TEST_F(CompositeFilterTest, TestPlay) {
   InSequence sequence;
 
Property changes on: media/base/composite_filter_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo