Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/base/filter_collection_unittest.cc

Index: media/base/filter_collection_unittest.cc
diff --git a/media/base/media_filter_collection_unittest.cc b/media/base/filter_collection_unittest.cc
similarity index 85%
rename from media/base/media_filter_collection_unittest.cc
rename to media/base/filter_collection_unittest.cc
index 523123be5af694a7b99e0f2163801e1d8fc5059a..fef7e7f76406beab5b0a30d77bd2b30e46d03893 100644
--- a/media/base/media_filter_collection_unittest.cc
+++ b/media/base/filter_collection_unittest.cc
@@ -2,25 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/media_filter_collection.h"
+#include "media/base/filter_collection.h"
 #include "media/base/mock_filters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
-class MediaFilterCollectionTest : public ::testing::Test {
+class FilterCollectionTest : public ::testing::Test {
  public:
-  MediaFilterCollectionTest() {}
-  virtual ~MediaFilterCollectionTest() {}
+  FilterCollectionTest() {}
+  virtual ~FilterCollectionTest() {}
 
  protected:
-  MediaFilterCollection collection_;
+  FilterCollection collection_;
   MockFilterCollection mock_filters_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaFilterCollectionTest);
+  DISALLOW_COPY_AND_ASSIGN(FilterCollectionTest);
 };
 
-TEST_F(MediaFilterCollectionTest, TestIsEmptyAndClear) {
+TEST_F(FilterCollectionTest, TestIsEmptyAndClear) {
   EXPECT_TRUE(collection_.IsEmpty());
 
   collection_.AddDataSource(mock_filters_.data_source());
@@ -32,7 +32,7 @@ TEST_F(MediaFilterCollectionTest, TestIsEmptyAndClear) {
   EXPECT_TRUE(collection_.IsEmpty());
 }
 
-TEST_F(MediaFilterCollectionTest, SelectXXXMethods) {
+TEST_F(FilterCollectionTest, SelectXXXMethods) {
   scoped_refptr<AudioDecoder> audio_decoder;
   scoped_refptr<DataSource> data_source;
 
@@ -70,7 +70,7 @@ TEST_F(MediaFilterCollectionTest, SelectXXXMethods) {
   EXPECT_TRUE(collection_.IsEmpty());
 }
 
-TEST_F(MediaFilterCollectionTest, MultipleFiltersOfSameType) {
+TEST_F(FilterCollectionTest, MultipleFiltersOfSameType) {
   scoped_refptr<DataSource> data_source_a(new MockDataSource());
   scoped_refptr<DataSource> data_source_b(new MockDataSource());