Deprecate LogCB in favor of using MediaLog

media/base/media_log.cc

 // Copyright (c) 2012 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/base/media_log.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 
@@ skipping 253 matching lines @@
 void MediaLog::SetTimeProperty(
     const std::string& key, base::TimeDelta value) {
   scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogEvent::PROPERTY_CHANGE));
   if (value.is_max())
     event->params.SetString(key, "unknown");
   else
     event->params.SetDouble(key, value.InSecondsF());
   AddEvent(event.Pass());
 }
 
-LogHelper::LogHelper(MediaLog::MediaLogLevel level, const LogCB& log_cb)
-    : level_(level), log_cb_(log_cb) {
-}
-
 LogHelper::LogHelper(MediaLog::MediaLogLevel level,
                      const scoped_refptr<MediaLog>& media_log)
     : level_(level), media_log_(media_log) {

[xhwang, 2015/07/13 22:41:17]

DCHECK media_log so that you don't need the check on l.280?

[wolenetz, 2015/07/13 22:59:24]

Done.

 }
 
 LogHelper::~LogHelper() {
-  if (!log_cb_.is_null())
-    log_cb_.Run(level_, stream_.str());
-  else if (media_log_)
+  if (media_log_)
     media_log_->AddLogEvent(level_, stream_.str());
 }
 
 }  //namespace media