Merge M56: "Add audio only watch time metrics."

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 <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 
 namespace media {
 
 // A count of all MediaLogs created in the current process. Used to generate
 // unique IDs.
 static base::StaticAtomicSequenceNumber g_media_log_count;
 
+// Audio+video watch time metrics.
 const char MediaLog::kWatchTimeAudioVideoAll[] =
     "Media.WatchTime.AudioVideo.All";
 const char MediaLog::kWatchTimeAudioVideoMse[] =
     "Media.WatchTime.AudioVideo.MSE";
 const char MediaLog::kWatchTimeAudioVideoEme[] =
     "Media.WatchTime.AudioVideo.EME";
 const char MediaLog::kWatchTimeAudioVideoSrc[] =
     "Media.WatchTime.AudioVideo.SRC";
 const char MediaLog::kWatchTimeAudioVideoBattery[] =
     "Media.WatchTime.AudioVideo.Battery";
 const char MediaLog::kWatchTimeAudioVideoAc[] = "Media.WatchTime.AudioVideo.AC";
 
+// Audio only "watch time" metrics.
+const char MediaLog::kWatchTimeAudioAll[] = "Media.WatchTime.Audio.All";
+const char MediaLog::kWatchTimeAudioMse[] = "Media.WatchTime.Audio.MSE";
+const char MediaLog::kWatchTimeAudioEme[] = "Media.WatchTime.Audio.EME";
+const char MediaLog::kWatchTimeAudioSrc[] = "Media.WatchTime.Audio.SRC";
+const char MediaLog::kWatchTimeAudioBattery[] = "Media.WatchTime.Audio.Battery";
+const char MediaLog::kWatchTimeAudioAc[] = "Media.WatchTime.Audio.AC";
+
 const char MediaLog::kWatchTimeFinalize[] = "FinalizeWatchTime";
 const char MediaLog::kWatchTimeFinalizePower[] = "FinalizePowerWatchTime";
 
 std::string MediaLog::MediaLogLevelToString(MediaLogLevel level) {
   switch (level) {
     case MEDIALOG_ERROR:
       return "error";
     case MEDIALOG_INFO:
       return "info";
     case MEDIALOG_DEBUG:
@@ skipping 261 matching lines @@
                      const scoped_refptr<MediaLog>& media_log)
     : level_(level), media_log_(media_log) {
   DCHECK(media_log_.get());
 }
 
 LogHelper::~LogHelper() {
   media_log_->AddLogEvent(level_, stream_.str());
 }
 
 }  //namespace media