Revert of Add correct support for videos with YUVJ420P color format, in the software conversion path.

media/filters/skcanvas_video_renderer.cc

Index: media/filters/skcanvas_video_renderer.cc
diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc
index 998a6403e5074b2a6cd1531439957af5ec1495a6..9781b4c49715a3d3a6e3327d501600777f0ea499 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -88,7 +88,7 @@
   }
 
   if (video_frame->format() == media::VideoFrame::YV12J) {
-    yuv_type = media::YV12J;
+    yuv_type = media::YV12;
     y_shift = 1;
   }
 
@@ -229,6 +229,7 @@
   switch (video_frame->format()) {
     case media::VideoFrame::YV12:
     case media::VideoFrame::I420:
+    case media::VideoFrame::YV12J:
       media::ConvertYUVToRGB32(
           video_frame->data(media::VideoFrame::kYPlane) + y_offset,
           video_frame->data(media::VideoFrame::kUPlane) + uv_offset,
@@ -240,20 +241,6 @@
           video_frame->stride(media::VideoFrame::kUPlane),
           bitmap->rowBytes(),
           media::YV12);
-      break;
-
-    case media::VideoFrame::YV12J:
-      media::ConvertYUVToRGB32(
-          video_frame->data(media::VideoFrame::kYPlane) + y_offset,
-          video_frame->data(media::VideoFrame::kUPlane) + uv_offset,
-          video_frame->data(media::VideoFrame::kVPlane) + uv_offset,
-          static_cast<uint8*>(bitmap->getPixels()),
-          video_frame->visible_rect().width(),
-          video_frame->visible_rect().height(),
-          video_frame->stride(media::VideoFrame::kYPlane),
-          video_frame->stride(media::VideoFrame::kUPlane),
-          bitmap->rowBytes(),
-          media::YV12J);
       break;
 
     case media::VideoFrame::YV16: