Revert 113895 - <video> decode in hardware!

media/base/composite_filter_unittest.cc

 // Copyright (c) 2011 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 361 matching lines @@
   // Test adding a null pointer.
   EXPECT_FALSE(composite_->AddFilter(NULL));
 
   scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>();
   EXPECT_EQ(NULL, filter->host());
 
   // Test failing because set_host() hasn't been called yet.
   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.
   scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>();
   EXPECT_EQ(NULL, filter->host());
 
   EXPECT_TRUE(composite_->AddFilter(filter));
+
   EXPECT_TRUE(filter->host() != NULL);
-
-  composite_->RemoveFilter(filter);
-  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;
 
   SetupAndAdd2Filters();
 
   // Verify successful call to Play().
   DoPlay();
 
@@ skipping 379 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