Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

cc/layers/video_layer_impl.cc

Index: cc/layers/video_layer_impl.cc
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index 759c79de26499667d1fa34762ad8117cb934c08f..754a2f25abb3248ee5e280003bf453f24c8c47b5 100644
--- a/cc/layers/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -233,8 +233,8 @@ void VideoLayerImpl::AppendQuads(RenderPass* render_pass,
       const gfx::Size ya_tex_size = coded_size;
       gfx::Size uv_tex_size;
 
-      if (frame_->format() == media::VideoFrame::NATIVE_TEXTURE) {
-        DCHECK_EQ(media::VideoFrame::TEXTURE_YUV_420, frame_->texture_format());
+      if (frame_->storage_type() == media::VideoFrame::STORAGE_TEXTURE) {
+        DCHECK_EQ(media::VideoFrame::I420, frame_->format());
         DCHECK_EQ(3u, frame_resources_.size());  // Alpha is not supported yet.
         DCHECK(visible_rect.origin().IsOrigin());
         DCHECK(visible_rect.size() == coded_size);