Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

webkit/glue/media/buffered_data_source.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 "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 633 matching lines @@
 }
 
 // This method simply returns kTimeoutMilliseconds. The purpose of this
 // method is to be overidded so as to provide a different timeout value
 // for testing purpose.
 base::TimeDelta BufferedDataSource::GetTimeoutMilliseconds() {
   return base::TimeDelta::FromMilliseconds(kTimeoutMilliseconds);
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// BufferedDataSource, media::MediaFilter implementation
+// BufferedDataSource, media::Filter implementation
 void BufferedDataSource::Initialize(const std::string& url,
                                     media::FilterCallback* callback) {
   // Saves the url.
   url_ = GURL(url);
 
   if (!IsProtocolSupportedForMedia(url_)) {
     // This method is called on the thread where host() lives so it is safe
     // to make this call.
     host()->SetError(media::PIPELINE_ERROR_NETWORK);
     callback->Run();
@@ skipping 497 matching lines @@
     return;
 
   if (network_activity != network_activity_) {
     network_activity_ = network_activity;
     host()->SetNetworkActivity(network_activity);
   }
   host()->SetBufferedBytes(buffered_last_byte_position + 1);
 }
 
 }  // namespace webkit_glue