Deprecate LogCB in favor of using MediaLog

media/formats/mpeg/mpeg_audio_stream_parser_base.cc

 // 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.
 
 #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/buffers.h"
@@ skipping 44 matching lines @@
 MPEGAudioStreamParserBase::~MPEGAudioStreamParserBase() {}
 
 void MPEGAudioStreamParserBase::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) {
+    const scoped_refptr<MediaLog>& media_log) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, UNINITIALIZED);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   new_buffers_cb_ = new_buffers_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
-  log_cb_ = log_cb;
+  media_log_ = media_log;
 
   ChangeState(INITIALIZED);
 }
 
 void MPEGAudioStreamParserBase::Flush() {
   DVLOG(1) << __FUNCTION__;
   DCHECK_NE(state_, UNINITIALIZED);
   queue_.Reset();
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   in_media_segment_ = false;
@@ skipping 171 matching lines @@
   if (size < 4)
     return 0;
 
   if (memcmp("ICY ", data, 4))
     return -1;
 
   int locate_size = std::min(size, kMaxIcecastHeaderSize);
   int offset = LocateEndOfHeaders(data, locate_size, 4);
   if (offset < 0) {
     if (locate_size == kMaxIcecastHeaderSize) {
-      MEDIA_LOG(ERROR, log_cb_) << "Icecast header is too large.";
+      MEDIA_LOG(ERROR, media_log_) << "Icecast header is too large.";
       return -1;
     }
 
     return 0;
   }
 
   return offset;
 }
 
 int MPEGAudioStreamParserBase::ParseID3v1(const uint8* data, int size) {
@@ skipping 40 matching lines @@
   // expose it as a metadata text track.
   return actual_tag_size;
 }
 
 bool MPEGAudioStreamParserBase::ParseSyncSafeInt(BitReader* reader,
                                                  int32* value) {
   *value = 0;
   for (int i = 0; i < 4; ++i) {
     uint8 tmp;
     if (!reader->ReadBits(1, &tmp) || tmp != 0) {
-      MEDIA_LOG(ERROR, log_cb_) << "ID3 syncsafe integer byte MSb is not 0!";
+      MEDIA_LOG(ERROR, media_log_) << "ID3 syncsafe integer byte MSb is not 0!";
       return false;
     }
 
     if (!reader->ReadBits(7, &tmp))
       return false;
 
     *value <<= 7;
     *value += tmp;
   }
 
@@ skipping 74 matching lines @@
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
 }  // namespace media