Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

webkit/glue/media/simple_data_source.h

 // 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.
 
 // An extremely simple implementation of DataSource that downloads the entire
 // media resource into memory before signaling that initialization has finished.
 // Primarily used to test <audio> and <video> with buffering/caching removed
 // from the equation.
 
 #ifndef WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_
@@ skipping 16 matching lines @@
 class WebMediaPlayerDelegateImpl;
 
 namespace webkit_glue {
 
 class SimpleDataSource : public WebDataSource,
                          public WebKit::WebURLLoaderClient {
  public:
   SimpleDataSource(MessageLoop* render_loop, WebKit::WebFrame* frame);
   virtual ~SimpleDataSource();
 
-  // MediaFilter implementation.
+  // media::Filter implementation.
   virtual void Stop(media::FilterCallback* callback);
 
-  // DataSource implementation.
+  // media::DataSource implementation.
   virtual void Initialize(const std::string& url,
                           media::FilterCallback* callback);
   virtual const media::MediaFormat& media_format();
   virtual void Read(int64 position, size_t size,
                     uint8* data, ReadCallback* read_callback);
   virtual bool GetSize(int64* size_out);
   virtual bool IsStreaming();
 
   // Used to inject a mock used for unittests.
   virtual void SetURLLoaderForTest(WebKit::WebURLLoader* mock_loader);
@@ skipping 76 matching lines @@
 
   // Used to ensure mocks for unittests are used instead of reset in Start().
   bool keep_test_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleDataSource);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_MEDIA_SIMPLE_DATA_SOURCE_H_