Revert of Mac: Decode hardware to 420 instead of 422

media/video/video_decode_accelerator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "media/base/bitstream_buffer.h"
 #include "media/base/surface_manager.h"
 #include "media/base/video_decoder_config.h"
 #include "media/video/picture.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gl/gl_image.h"
 
 typedef unsigned int GLenum;
 
 namespace media {
 
 // Video decoder interface.
 // This interface is extended by the various components that ultimately
 // implement the backend of PPB_VideoDecoder_Dev.
 class MEDIA_EXPORT VideoDecodeAccelerator {
  public:
   // Specification of a decoding profile supported by an decoder.
   // |max_resolution| and |min_resolution| are inclusive.
   struct MEDIA_EXPORT SupportedProfile {
     SupportedProfile();
     ~SupportedProfile();
     VideoCodecProfile profile;
     gfx::Size max_resolution;
     gfx::Size min_resolution;
     bool encrypted_only;
   };
   using SupportedProfiles = std::vector<SupportedProfile>;
 
-  using MakeContextCurrentCallback = base::Callback<bool(void)>;
-  using BindImageCallback = base::Callback<
-      void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>, bool)>;
-
   struct MEDIA_EXPORT Capabilities {
     Capabilities();
     Capabilities(const Capabilities& other);
     ~Capabilities();
 
     std::string AsHumanReadableString() const;
 
     // Flags that can be associated with a VDA.
     enum Flags {
       NO_FLAGS = 0,
@@ skipping 202 matching lines @@
 // Specialize std::default_delete so that scoped_ptr<VideoDecodeAccelerator>
 // uses "Destroy()" instead of trying to use the destructor.
 template <>
 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
   void operator()(media::VideoDecodeAccelerator* vda) const;
 };
 
 }  // namespace std
 
 #endif  // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_