Move FilterType into MediaFilterCollection

media/base/media_filter_collection_unittest.cc

Index: media/base/media_filter_collection_unittest.cc
diff --git a/media/base/media_filter_collection_unittest.cc b/media/base/media_filter_collection_unittest.cc
index d974b4fda17bf17469100e6f683ebd4f54cf45f5..523123be5af694a7b99e0f2163801e1d8fc5059a 100644
--- a/media/base/media_filter_collection_unittest.cc
+++ b/media/base/media_filter_collection_unittest.cc
@@ -23,7 +23,7 @@ class MediaFilterCollectionTest : public ::testing::Test {
 TEST_F(MediaFilterCollectionTest, TestIsEmptyAndClear) {
   EXPECT_TRUE(collection_.IsEmpty());
 
-  collection_.AddFilter(mock_filters_.data_source());
+  collection_.AddDataSource(mock_filters_.data_source());
 
   EXPECT_FALSE(collection_.IsEmpty());
 
@@ -32,41 +32,41 @@ TEST_F(MediaFilterCollectionTest, TestIsEmptyAndClear) {
   EXPECT_TRUE(collection_.IsEmpty());
 }
 
-TEST_F(MediaFilterCollectionTest, SelectFilter) {
+TEST_F(MediaFilterCollectionTest, SelectXXXMethods) {
   scoped_refptr<AudioDecoder> audio_decoder;
   scoped_refptr<DataSource> data_source;
 
-  collection_.AddFilter(mock_filters_.data_source());
+  collection_.AddDataSource(mock_filters_.data_source());
   EXPECT_FALSE(collection_.IsEmpty());
 
   // Verify that the data source will not be returned if we
   // ask for a different type.
-  collection_.SelectFilter(&audio_decoder);
+  collection_.SelectAudioDecoder(&audio_decoder);
   EXPECT_FALSE(audio_decoder);
   EXPECT_FALSE(collection_.IsEmpty());
 
   // Verify that we can actually retrieve the data source
   // and that it is removed from the collection.
-  collection_.SelectFilter(&data_source);
+  collection_.SelectDataSource(&data_source);
   EXPECT_TRUE(data_source);
   EXPECT_TRUE(collection_.IsEmpty());
 
   // Add a data source and audio decoder.
-  collection_.AddFilter(mock_filters_.data_source());
-  collection_.AddFilter(mock_filters_.audio_decoder());
+  collection_.AddDataSource(mock_filters_.data_source());
+  collection_.AddAudioDecoder(mock_filters_.audio_decoder());
 
   // Verify that we can select the audio decoder.
-  collection_.SelectFilter(&audio_decoder);
+  collection_.SelectAudioDecoder(&audio_decoder);
   EXPECT_TRUE(audio_decoder);
   EXPECT_FALSE(collection_.IsEmpty());
 
   // Verify that we can't select it again since only one has been added.
-  collection_.SelectFilter(&audio_decoder);
+  collection_.SelectAudioDecoder(&audio_decoder);
   EXPECT_FALSE(audio_decoder);
 
   // Verify that we can select the data source and that doing so will
   // empty the collection again.
-  collection_.SelectFilter(&data_source);
+  collection_.SelectDataSource(&data_source);
   EXPECT_TRUE(collection_.IsEmpty());
 }
 
@@ -76,23 +76,23 @@ TEST_F(MediaFilterCollectionTest, MultipleFiltersOfSameType) {
 
   scoped_refptr<DataSource> data_source;
 
-  collection_.AddFilter(data_source_a.get());
-  collection_.AddFilter(data_source_b.get());
+  collection_.AddDataSource(data_source_a.get());
+  collection_.AddDataSource(data_source_b.get());
 
-  // Verify that first SelectFilter() returns data_source_a.
-  collection_.SelectFilter(&data_source);
+  // Verify that first SelectDataSource() returns data_source_a.
+  collection_.SelectDataSource(&data_source);
   EXPECT_TRUE(data_source);
   EXPECT_EQ(data_source, data_source_a);
   EXPECT_FALSE(collection_.IsEmpty());
 
-  // Verify that second SelectFilter() returns data_source_b.
-  collection_.SelectFilter(&data_source);
+  // Verify that second SelectDataSource() returns data_source_b.
+  collection_.SelectDataSource(&data_source);
   EXPECT_TRUE(data_source);
   EXPECT_EQ(data_source, data_source_b);
   EXPECT_TRUE(collection_.IsEmpty());
 
-  // Verify that third SelectFilter returns nothing.
-  collection_.SelectFilter(&data_source);
+  // Verify that third SelectDataSource() returns nothing.
+  collection_.SelectDataSource(&data_source);
   EXPECT_FALSE(data_source);
 }