Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/tools/player_x11/player_x11.cc

 // Copyright (c) 2010 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 <iostream>
 #include <signal.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 #include "base/at_exit.h"
@@ skipping 79 matching lines @@
     return false;
   }
 
   // Load media libraries.
   if (!media::InitializeMediaLibrary(FilePath())) {
     std::cout << "Unable to initialize the media library." << std::endl;
     return false;
   }
 
   // Create our filter factories.
-  scoped_ptr<media::MediaFilterCollection> collection(
-      new media::MediaFilterCollection());
+  scoped_ptr<media::FilterCollection> collection(
+      new media::FilterCollection());
   collection->AddDataSource(new media::FileDataSource());
   collection->AddDemuxer(new media::FFmpegDemuxer());
   collection->AddAudioDecoder(new media::FFmpegAudioDecoder());
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableOpenMax)) {
     collection->AddVideoDecoder(new media::OmxVideoDecoder(NULL));
   } else {
     collection->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL));
   }
   collection->AddVideoRenderer(new Renderer(g_display,
@@ skipping 150 matching lines @@
   } else{
     std::cout << "Pipeline initialization failed..." << std::endl;
   }
 
   // Cleanup tasks.
   thread->Stop();
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   return 0;
 }