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

content/browser/media/capture/aura_window_capture_machine.cc

Index: content/browser/media/capture/aura_window_capture_machine.cc
diff --git a/content/browser/media/capture/aura_window_capture_machine.cc b/content/browser/media/capture/aura_window_capture_machine.cc
index 4b981b2c5c51114403584cd3449a741907476b0a..87b8623a9a9cc587c567fba34ce00df9eef6892e 100644
--- a/content/browser/media/capture/aura_window_capture_machine.cc
+++ b/content/browser/media/capture/aura_window_capture_machine.cc
@@ -306,10 +306,8 @@
   if (result->IsEmpty() || result->size().IsEmpty() || !desktop_window_)
     return false;
 
-  if (capture_params_.requested_format.pixel_storage ==
-      media::PIXEL_STORAGE_TEXTURE) {
-    DCHECK_EQ(capture_params_.requested_format.pixel_format,
-              media::PIXEL_FORMAT_ARGB);
+  if (capture_params_.requested_format.pixel_format ==
+      media::PIXEL_FORMAT_TEXTURE) {
     DCHECK(!video_frame.get());
     cc::TextureMailbox texture_mailbox;
     scoped_ptr<cc::SingleReleaseCallback> release_callback;