Reland: 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 87b8623a9a9cc587c567fba34ce00df9eef6892e..4b981b2c5c51114403584cd3449a741907476b0a 100644
--- a/content/browser/media/capture/aura_window_capture_machine.cc
+++ b/content/browser/media/capture/aura_window_capture_machine.cc
@@ -306,8 +306,10 @@ bool AuraWindowCaptureMachine::ProcessCopyOutputResponse(
   if (result->IsEmpty() || result->size().IsEmpty() || !desktop_window_)
     return false;
 
-  if (capture_params_.requested_format.pixel_format ==
-      media::PIXEL_FORMAT_TEXTURE) {
+  if (capture_params_.requested_format.pixel_storage ==
+      media::PIXEL_STORAGE_TEXTURE) {
+    DCHECK_EQ(capture_params_.requested_format.pixel_format,

[dcheng, 2015/06/24 21:41:47]

The arguments to this macro should be reversed.

[mcasas, 2015/06/25 01:19:51]

Done.

+              media::PIXEL_FORMAT_ARGB);
     DCHECK(!video_frame.get());
     cc::TextureMailbox texture_mailbox;
     scoped_ptr<cc::SingleReleaseCallback> release_callback;