Revert of media-internals: Simplify the code path for creating a media log entry

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 42 matching lines @@
                                             base::TimeDelta value);
   scoped_ptr<MediaLogEvent> CreateLoadEvent(const std::string& url);
   scoped_ptr<MediaLogEvent> CreateSeekEvent(float seconds);
   scoped_ptr<MediaLogEvent> CreatePipelineStateChangedEvent(
       Pipeline::State state);
   scoped_ptr<MediaLogEvent> CreatePipelineErrorEvent(PipelineStatus error);
   scoped_ptr<MediaLogEvent> CreateVideoSizeSetEvent(
       size_t width, size_t height);
   scoped_ptr<MediaLogEvent> CreateBufferedExtentsChangedEvent(
       int64 start, int64 current, int64 end);
-
-  // Report a log message at the specified log level.
-  void AddLogEvent(MediaLogLevel level, const std::string& message);
+  scoped_ptr<MediaLogEvent> CreateLogEvent(MediaLogLevel level,
+                                           const std::string& message);
 
   // Report a property change without an accompanying event.
   void SetStringProperty(const std::string& key, const std::string& value);
   void SetIntegerProperty(const std::string& key, int value);
   void SetDoubleProperty(const std::string& key, double value);
   void SetBooleanProperty(const std::string& key, bool value);
   void SetTimeProperty(const std::string& key, base::TimeDelta value);
 
  protected:
   friend class base::RefCountedThreadSafe<MediaLog>;
@@ skipping 31 matching lines @@
   LogHelper((MediaLog::MEDIALOG_##level), (log_cb)).stream()
 
 // Logs only while count < max. Increments count for each log. Use LAZY_STREAM
 // to avoid wasteful evaluation of subsequent stream arguments.
 #define LIMITED_MEDIA_LOG(level, log_cb, count, max) \
   LAZY_STREAM(MEDIA_LOG(level, log_cb), (count) < (max) && ((count)++ || true))
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_LOG_H_