Deprecate LogCB in favor of using MediaLog

media/formats/mpeg/mpeg_audio_stream_parser_base.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
 #define MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 20 matching lines @@
   ~MPEGAudioStreamParserBase() override;
 
   // StreamParser implementation.
   void Init(const InitCB& init_cb,
             const NewConfigCB& config_cb,
             const NewBuffersCB& new_buffers_cb,
             bool ignore_text_tracks,
             const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
             const NewMediaSegmentCB& new_segment_cb,
             const base::Closure& end_of_segment_cb,
-            const LogCB& log_cb) override;
+            const scoped_refptr<MediaLog>& media_log) override;
   void Flush() override;
   bool Parse(const uint8* buf, int size) override;
 
  protected:
   // Subclasses implement this method to parse format specific frame headers.
   // |data| & |size| describe the data available for parsing.
   //
   // Implementations are expected to consume an entire frame header.  It should
   // only return a value greater than 0 when |data| has enough bytes to
   // successfully parse & consume the entire frame header.
@@ skipping 22 matching lines @@
   //   0 : If more data is needed to parse the entire frame header.
   // < 0 : An error was encountered during parsing.
   virtual int ParseFrameHeader(const uint8* data,
                                int size,
                                int* frame_size,
                                int* sample_rate,
                                ChannelLayout* channel_layout,
                                int* sample_count,
                                bool* metadata_frame) const = 0;
 
-  const LogCB& log_cb() const { return log_cb_; }
+  const scoped_refptr<MediaLog>& media_log() const { return media_log_; }
 
  private:
   enum State {
     UNINITIALIZED,
     INITIALIZED,
     PARSE_ERROR
   };
 
   void ChangeState(State state);
 
@@ skipping 35 matching lines @@
   // Returns true if the buffers are sent successfully.
   bool SendBuffers(BufferQueue* buffers, bool end_of_segment);
 
   State state_;
 
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB new_buffers_cb_;
   NewMediaSegmentCB new_segment_cb_;
   base::Closure end_of_segment_cb_;
-  LogCB log_cb_;
+  scoped_refptr<MediaLog> media_log_;
 
   ByteQueue queue_;
 
   AudioDecoderConfig config_;
   scoped_ptr<AudioTimestampHelper> timestamp_helper_;
   bool in_media_segment_;
   const uint32 start_code_mask_;
   const AudioCodec audio_codec_;
   const int codec_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_