Rename trace category webmediaplayerms to media

This category is only exists in two files. It doesn't have a strong reason to
exist and appear as an option in tracing.

Bug: 817616
Change-Id: Icdbe89b67e5a32b1e3a994f246cf769df0261df1
Reviewed-on: https://chromium-review.googlesource.com/942191Reviewed-by: Christian Fremerey <chfremer@chromium.org>
Commit-Queue: Emircan Uysaler <emircan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540332}

content/renderer/media/stream/webmediaplayer_ms.cc

@@ -123,10 +123,10 @@ class WebMediaPlayerMS::FrameDeliverer {
     base::TimeTicks render_time;
     if (frame->metadata()->GetTimeTicks(
             media::VideoFrameMetadata::REFERENCE_TIME, &render_time)) {
-      TRACE_EVENT1("webmediaplayerms", "FrameReady", "Ideal Render Instant",
+      TRACE_EVENT1("media", "FrameReady", "Ideal Render Instant",
                    render_time.ToInternalValue());
     } else {
-      TRACE_EVENT0("webmediaplayerms", "FrameReady");
+      TRACE_EVENT0("media", "FrameReady");
     }
 
     const bool is_opaque = media::IsOpaque(frame->format());
@@ -829,7 +829,7 @@ bool WebMediaPlayerMS::CopyVideoTextureToPlatformTexture(
     bool flip_y,
     int already_uploaded_id,
     VideoFrameUploadMetadata* out_metadata) {
-  TRACE_EVENT0("webmediaplayerms", "copyVideoTextureToPlatformTexture");
+  TRACE_EVENT0("media", "copyVideoTextureToPlatformTexture");
   DCHECK(thread_checker_.CalledOnValidThread());
 
   scoped_refptr<media::VideoFrame> video_frame =
@@ -864,7 +864,7 @@ bool WebMediaPlayerMS::TexImageImpl(TexImageFunctionID functionID,
                                     int zoffset,
                                     bool flip_y,
                                     bool premultiply_alpha) {
-  TRACE_EVENT0("webmediaplayerms", "texImageImpl");
+  TRACE_EVENT0("media", "texImageImpl");
   DCHECK(thread_checker_.CalledOnValidThread());
 
   const scoped_refptr<media::VideoFrame> video_frame =

content/renderer/media/stream/webmediaplayer_ms_compositor.cc

@@ -267,9 +267,9 @@ bool WebMediaPlayerMSCompositor::UpdateCurrentFrame(
     base::TimeTicks deadline_max) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
 
-  TRACE_EVENT_BEGIN2("webmediaplayerms", "UpdateCurrentFrame",
-                     "Actual Render Begin", deadline_min.ToInternalValue(),
-                     "Actual Render End", deadline_max.ToInternalValue());
+  TRACE_EVENT_BEGIN2("media", "UpdateCurrentFrame", "Actual Render Begin",
+                     deadline_min.ToInternalValue(), "Actual Render End",
+                     deadline_max.ToInternalValue());
   if (stopped_)
     return false;
 
@@ -287,9 +287,8 @@ bool WebMediaPlayerMSCompositor::UpdateCurrentFrame(
            "sophisticated video rendering algorithm.";
   }
 
-  TRACE_EVENT_END2("webmediaplayerms", "UpdateCurrentFrame",
-                   "Ideal Render Instant", render_time.ToInternalValue(),
-                   "Serial", serial_);
+  TRACE_EVENT_END2("media", "UpdateCurrentFrame", "Ideal Render Instant",
+                   render_time.ToInternalValue(), "Serial", serial_);
 
   return !current_frame_used_by_compositor_;
 }