Revert hardware decoder changes causing ChromeOS HW test crash.

media/base/video_frame.h

Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 0ffd0585cdb20d434760d8e6d654f753b1c4e9db..54da038fa2470fb5a7b330191b6b057b541100b2 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -40,7 +40,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
     kMaxPlanes = 4,
 
     kYPlane = 0,
-    kARGBPlane = kYPlane,
     kUPlane = 1,
     kUVPlane = kUPlane,
     kVPlane = 2,
@@ -64,9 +63,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
     YV12J = 7,  // JPEG color range version of YV12
     NV12 = 8,  // 12bpp 1x1 Y plane followed by an interleaved 2x2 UV plane.
     YV24 = 9,  // 24bpp YUV planar, no subsampling.
-    ARGB = 10,  // 32bpp ARGB, 1 plane.
-    // Please update UMA histogram enumeration when adding new formats here.
-    FORMAT_MAX = ARGB,  // Must always be equal to largest entry logged.
+    FORMAT_MAX = YV24,  // Must always be equal to largest entry logged.
   };
 
   // Returns the name of a Format as a string.