Deprecate LogCB in favor of using MediaLog

media/base/media_log.h

 // 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.
 
 #ifndef MEDIA_BASE_MEDIA_LOG_H_
 #define MEDIA_BASE_MEDIA_LOG_H_
 
 #include <sstream>
 #include <string>
 
@@ skipping 63 matching lines @@
   friend class base::RefCountedThreadSafe<MediaLog>;
   virtual ~MediaLog();
 
  private:
   // A unique (to this process) id for this MediaLog.
   int32 id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaLog);
 };
 
-// Indicates a string should be added to the log.
-// First parameter - The log level for the string.
-// Second parameter - The string to add to the log.
-typedef base::Callback<void(MediaLog::MediaLogLevel, const std::string&)> LogCB;
-
-// Helper class to make it easier to use LogCB or MediaLog like DVLOG().
+// Helper class to make it easier to use MediaLog like DVLOG().
 class MEDIA_EXPORT LogHelper {
  public:
-  LogHelper(MediaLog::MediaLogLevel level, const LogCB& log_cb);
   LogHelper(MediaLog::MediaLogLevel level,
             const scoped_refptr<MediaLog>& media_log);
   ~LogHelper();
 
   std::ostream& stream() { return stream_; }
 
  private:
   MediaLog::MediaLogLevel level_;
-  LogCB log_cb_;
   const scoped_refptr<MediaLog> media_log_;
   std::stringstream stream_;
 };
 
 // Provides a stringstream to collect a log entry to pass to the provided
-// logger (LogCB or MediaLog) at the requested level.
-#define MEDIA_LOG(level, logger) \
-  LogHelper((MediaLog::MEDIALOG_##level), (logger)).stream()
+// MediaLog at the requested level.
+#define MEDIA_LOG(level, media_log) \
+  LogHelper((MediaLog::MEDIALOG_##level), (media_log)).stream()
 
 // Logs only while |count| < |max|, increments |count| for each log, and warns
 // in the log if |count| has just reached |max|.
 // Multiple short-circuit evaluations are involved in this macro:
 // 1) LAZY_STREAM avoids wasteful MEDIA_LOG and evaluation of subsequent stream
 //    arguments if |count| is >= |max|, and
 // 2) the |condition| given to LAZY_STREAM itself short-circuits to prevent
 //    incrementing |count| beyond |max|.
 // Note that LAZY_STREAM guarantees exactly one evaluation of |condition|, so
 // |count| will be incremented at most once each time this macro runs.
 // The "|| true" portion of |condition| lets logging occur correctly when
 // |count| < |max| and |count|++ is 0.
 // TODO(wolenetz,chcunningham): Consider using a helper class instead of a macro
 // to improve readability.
-#define LIMITED_MEDIA_LOG(level, logger, count, max)                          \
-  LAZY_STREAM(MEDIA_LOG(level, logger),                                       \
+#define LIMITED_MEDIA_LOG(level, media_log, count, max)                       \
+  LAZY_STREAM(MEDIA_LOG(level, media_log),                                    \
               (count) < (max) && ((count)++ || true))                         \
       << (((count) == (max)) ? "(Log limit reached. Further similar entries " \
                                "may be suppressed): "                         \
                              : "")
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_LOG_H_