Deprecate LogCB in favor of using MediaLog

media/formats/webm/webm_video_client.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/webm/webm_video_client.h"
 
 #include "media/base/video_decoder_config.h"
 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
-WebMVideoClient::WebMVideoClient(const LogCB& log_cb)
-    : log_cb_(log_cb) {
+WebMVideoClient::WebMVideoClient(const scoped_refptr<MediaLog>& media_log)
+    : media_log_(media_log) {
   Reset();
 }
 
 WebMVideoClient::~WebMVideoClient() {
 }
 
 void WebMVideoClient::Reset() {
   pixel_width_ = -1;
   pixel_height_ = -1;
   crop_bottom_ = -1;
@@ skipping 13 matching lines @@
 
   VideoCodec video_codec = kUnknownVideoCodec;
   VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
   if (codec_id == "V_VP8") {
     video_codec = kCodecVP8;
     profile = VP8PROFILE_ANY;
   } else if (codec_id == "V_VP9") {
     video_codec = kCodecVP9;
     profile = VP9PROFILE_ANY;
   } else {
-    MEDIA_LOG(ERROR, log_cb_) << "Unsupported video codec_id " << codec_id;
+    MEDIA_LOG(ERROR, media_log_) << "Unsupported video codec_id " << codec_id;
     return false;
   }
 
   VideoPixelFormat format =
       (alpha_mode_ == 1) ? PIXEL_FORMAT_YV12A : PIXEL_FORMAT_YV12;
 
   if (pixel_width_ <= 0 || pixel_height_ <= 0)
     return false;
 
   // Set crop and display unit defaults if these elements are not present.
@@ skipping 18 matching lines @@
                          pixel_height_ - (crop_top_ + crop_bottom_));
   if (display_unit_ == 0) {
     if (display_width_ <= 0)
       display_width_ = visible_rect.width();
     if (display_height_ <= 0)
       display_height_ = visible_rect.height();
   } else if (display_unit_ == 3) {
     if (display_width_ <= 0 || display_height_ <= 0)
       return false;
   } else {
-    MEDIA_LOG(ERROR, log_cb_) << "Unsupported display unit type "
-                              << display_unit_;
+    MEDIA_LOG(ERROR, media_log_) << "Unsupported display unit type "
+                                 << display_unit_;
     return false;
   }
   gfx::Size natural_size = gfx::Size(display_width_, display_height_);
   const uint8* extra_data = NULL;
   size_t extra_data_size = 0;
   if (codec_private.size() > 0) {
     extra_data = &codec_private[0];
     extra_data_size = codec_private.size();
   }
 
@@ skipping 35 matching lines @@
       dst = &display_unit_;
       break;
     case kWebMIdAlphaMode:
       dst = &alpha_mode_;
       break;
     default:
       return true;
   }
 
   if (*dst != -1) {
-    MEDIA_LOG(ERROR, log_cb_) << "Multiple values for id " << std::hex << id
-                              << " specified (" << *dst << " and " << val
-                              << ")";
+    MEDIA_LOG(ERROR, media_log_) << "Multiple values for id " << std::hex << id
+                                 << " specified (" << *dst << " and " << val
+                                 << ")";
     return false;
   }
 
   *dst = val;
   return true;
 }
 
 bool WebMVideoClient::OnBinary(int id, const uint8* data, int size) {
   // Accept binary fields we don't care about for now.
   return true;
 }
 
 bool WebMVideoClient::OnFloat(int id, double val) {
   // Accept float fields we don't care about for now.
   return true;
 }
 
 }  // namespace media