Revert of Video Capture: extract storage info from pixel format in VideoCaptureFormat.

content/common/media/media_param_traits.cc

Index: content/common/media/media_param_traits.cc
diff --git a/content/common/media/media_param_traits.cc b/content/common/media/media_param_traits.cc
index 7cbeca9850a634ae80bfa1267270c7e991f2d418..280d908ccfc00386bb8f88217abbd6897acbe6eb 100644
--- a/content/common/media/media_param_traits.cc
+++ b/content/common/media/media_param_traits.cc
@@ -13,7 +13,6 @@
 using media::ChannelLayout;
 using media::VideoCaptureFormat;
 using media::VideoPixelFormat;
-using media::VideoPixelStorage;
 
 namespace IPC {
 
@@ -64,24 +63,23 @@
   m->WriteInt(p.frame_size.height());
   m->WriteFloat(p.frame_rate);
   m->WriteInt(static_cast<int>(p.pixel_format));
-  m->WriteInt(static_cast<int>(p.pixel_storage));
 }
 
 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
                                            base::PickleIterator* iter,
                                            VideoCaptureFormat* r) {
-  int frame_size_width, frame_size_height, pixel_format, pixel_storage;
+  int frame_size_width, frame_size_height, pixel_format;
   if (!iter->ReadInt(&frame_size_width) ||
       !iter->ReadInt(&frame_size_height) ||
       !iter->ReadFloat(&r->frame_rate) ||
-      !iter->ReadInt(&pixel_format) ||
-      !iter->ReadInt(&pixel_storage))
+      !iter->ReadInt(&pixel_format))
     return false;
 
   r->frame_size.SetSize(frame_size_width, frame_size_height);
   r->pixel_format = static_cast<VideoPixelFormat>(pixel_format);
-  r->pixel_storage = static_cast<VideoPixelStorage>(pixel_storage);
-  return r->IsValid();
+  if (!r->IsValid())
+    return false;
+  return true;
 }
 
 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,