Convert MediaLog from being ref counted to owned by WebMediaPlayer.

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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <sstream>
 #include <string>
 
 #include "base/containers/flat_set.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "media/base/buffering_state.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log_event.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/pipeline_status.h"
 #include "url/gurl.h"
 
 namespace media {
 
-class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> {
+class MEDIA_EXPORT MediaLog {
  public:
   enum MediaLogLevel {
     MEDIALOG_ERROR,
     MEDIALOG_INFO,
     MEDIALOG_DEBUG,
   };
 
   // Convert various enums to strings.
   static std::string MediaLogLevelToString(MediaLogLevel level);
   static MediaLogEvent::Type MediaLogLevelToEventType(MediaLogLevel level);
   static std::string EventTypeToString(MediaLogEvent::Type type);
   static std::string PipelineStatusToString(PipelineStatus status);
   static std::string BufferingStateToString(BufferingState state);
 
   static std::string MediaEventToLogString(const MediaLogEvent& event);
 
   MediaLog();
+  virtual ~MediaLog();
 
   // Add an event to this log. Overriden by inheritors to actually do something
   // with it.
   virtual void AddEvent(std::unique_ptr<MediaLogEvent> event);
 
   // Retrieve an error message, if any.
   virtual std::string GetLastErrorMessage();
 
   // Records the domain and registry of the current frame security origin to a
   // Rappor privacy-preserving metric. See:
@@ skipping 60 matching lines @@
   static const char kWatchTimeAudioVideoBackgroundAc[];
   static const char kWatchTimeAudioVideoBackgroundEmbeddedExperience[];
 
   // Markers which signify the watch time should be finalized immediately.
   static const char kWatchTimeFinalize[];
   static const char kWatchTimeFinalizePower[];
 
   static base::flat_set<base::StringPiece> GetWatchTimeKeys();
   static base::flat_set<base::StringPiece> GetWatchTimePowerKeys();
 
- protected:
-  friend class base::RefCountedThreadSafe<MediaLog>;
-  virtual ~MediaLog();
-
  private:
   // A unique (to this process) id for this MediaLog.
   int32_t id_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaLog);
 };
 
 // Helper class to make it easier to use MediaLog like DVLOG().
 class MEDIA_EXPORT LogHelper {
  public:
-  LogHelper(MediaLog::MediaLogLevel level,
-            const scoped_refptr<MediaLog>& media_log);
+  LogHelper(MediaLog::MediaLogLevel level, MediaLog* media_log);
   ~LogHelper();
 
   std::ostream& stream() { return stream_; }
 
  private:
-  MediaLog::MediaLogLevel level_;
-  const scoped_refptr<MediaLog> media_log_;
+  const MediaLog::MediaLogLevel level_;
+  MediaLog* const media_log_;
   std::stringstream stream_;
 };
 
 // Provides a stringstream to collect a log entry to pass to the provided
 // 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|.
@@ skipping 11 matching lines @@
 #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_