Lots of files touched for a very simple change. Everywhere we used a const M...

media/base/filters.h

 // Copyright (c) 2006-2009 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.
 
 // Filters are connected in a strongly typed manner, with downstream filters
 // always reading data from upstream filters.  Upstream filters have no clue
 // who is actually reading from them, and return the results via OnAssignment
 // using the AssignableInterface<SomeBufferType> interface:
 //
 //                         DemuxerStream(Video) <- VideoDecoder <- VideoRenderer
@@ skipping 79 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MediaFilter);
 };
 
 
 class DataSource : public MediaFilter {
  public:
   static const FilterType filter_type() {
     return FILTER_DATA_SOURCE;
   }
 
-  static bool IsMediaFormatSupported(const MediaFormat* media_format) {
+  static bool IsMediaFormatSupported(const MediaFormat& media_format) {
     std::string mime_type;
-    return (media_format->GetAsString(MediaFormat::kMimeType, &mime_type) &&
+    return (media_format.GetAsString(MediaFormat::kMimeType, &mime_type) &&
             mime_type == mime_type::kURL);
   }
 
   static const size_t kReadError = static_cast<size_t>(-1);
 
   // Initializes this filter, returns true if successful, false otherwise.
   virtual bool Initialize(const std::string& url) = 0;
 
   // Returns the MediaFormat for this filter.
-  virtual const MediaFormat* GetMediaFormat() = 0;
+  virtual const MediaFormat& media_format() = 0;
 
   // Read the given amount of bytes into data, returns the number of bytes read
   // if successful, kReadError otherwise.
   virtual size_t Read(uint8* data, size_t size) = 0;
 
   // Returns true and the current file position for this file, false if the
   // file position could not be retrieved.
   virtual bool GetPosition(int64* position_out) = 0;
 
   // Returns true if the file position could be set, false otherwise.
   virtual bool SetPosition(int64 position) = 0;
 
   // Returns true and the file size, false if the file size could not be
   // retrieved.
   virtual bool GetSize(int64* size_out) = 0;
 };
 
 
 class Demuxer : public MediaFilter {
  public:
   static const FilterType filter_type() {
     return FILTER_DEMUXER;
   }
 
-  static bool IsMediaFormatSupported(const MediaFormat* media_format) {
+  static bool IsMediaFormatSupported(const MediaFormat& media_format) {
     std::string mime_type;
-    return (media_format->GetAsString(MediaFormat::kMimeType, &mime_type) &&
+    return (media_format.GetAsString(MediaFormat::kMimeType, &mime_type) &&
             mime_type == mime_type::kApplicationOctetStream);
   }
 
   // Initializes this filter, returns true if successful, false otherwise.
   virtual bool Initialize(DataSource* data_source) = 0;
 
   // Returns the number of streams available
   virtual size_t GetNumberOfStreams() = 0;
 
   // Returns the stream for the given index, NULL otherwise
   virtual scoped_refptr<DemuxerStream> GetStream(int stream_id) = 0;
 };
 
 
 class DemuxerStream : public base::RefCountedThreadSafe<DemuxerStream> {
  public:
   // Returns the MediaFormat for this filter.
-  virtual const MediaFormat* GetMediaFormat() = 0;
+  virtual const MediaFormat& media_format() = 0;
 
   // Schedules a read and takes ownership of the given buffer.
   virtual void Read(Assignable<Buffer>* buffer) = 0;
 
   // Given a class that supports the |Interface| and a related static method
   // interface_id(), which returns a const char*, this method returns true if
   // the class returns an interface pointer and assigns the pointer to
   // |interface_out|.  Otherwise this method returns false.
   template <class Interface>
   bool QueryInterface(scoped_refptr<Interface>* interface_out) {
@@ skipping 23 matching lines @@
   }
 
   static const char* major_mime_type() {
     return mime_type::kMajorTypeVideo;
   }
 
   // Initializes this filter, returns true if successful, false otherwise.
   virtual bool Initialize(DemuxerStream* demuxer_stream) = 0;
 
   // Returns the MediaFormat for this filter.
-  virtual const MediaFormat* GetMediaFormat() = 0;
+  virtual const MediaFormat& media_format() = 0;
 
   // Schedules a read and takes ownership of the given buffer.
   virtual void Read(Assignable<VideoFrame>* video_frame) = 0;
 };
 
 
 class AudioDecoder : public MediaFilter {
  public:
   static const FilterType filter_type() {
     return FILTER_AUDIO_DECODER;
   }
 
   static const char* major_mime_type() {
     return mime_type::kMajorTypeAudio;
   }
 
   // Initializes this filter, returns true if successful, false otherwise.
   virtual bool Initialize(DemuxerStream* demuxer_stream) = 0;
 
   // Returns the MediaFormat for this filter.
-  virtual const MediaFormat* GetMediaFormat() = 0;
+  virtual const MediaFormat& media_format() = 0;
 
   // Schedules a read and takes ownership of the given buffer.
   virtual void Read(Assignable<Buffer>* buffer) = 0;
 };
 
 
 class VideoRenderer : public MediaFilter {
  public:
   static const FilterType filter_type() {
     return FILTER_VIDEO_RENDERER;
@@ skipping 21 matching lines @@
   // Initializes this filter, returns true if successful, false otherwise.
   virtual bool Initialize(AudioDecoder* decoder) = 0;
 
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTERS_H_