| Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| index ddd5ebe6570cac2a015e5c2966e95d4910b50c9e..0d94eaa2d80876ff37f0460af66f1350eeb2a575 100644
|
| --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| @@ -33,8 +33,6 @@
|
| #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
|
| #include "ui/gl/gl_context_glx.h"
|
| #include "ui/gl/gl_implementation.h"
|
| -#elif defined(USE_OZONE)
|
| -#include "media/ozone/media_ozone_platform.h"
|
| #elif defined(OS_ANDROID)
|
| #include "content/common/gpu/media/android_video_decode_accelerator.h"
|
| #endif
|
| @@ -277,15 +275,6 @@
|
| static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
|
| video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator(
|
| glx_context->display(), make_context_current_));
|
| -#elif defined(USE_OZONE)
|
| - media::MediaOzonePlatform* platform =
|
| - media::MediaOzonePlatform::GetInstance();
|
| - video_decode_accelerator_.reset(platform->CreateVideoDecodeAccelerator(
|
| - make_context_current_));
|
| - if (!video_decode_accelerator_) {
|
| - SendCreateDecoderReply(init_done_msg, false);
|
| - return;
|
| - }
|
| #elif defined(OS_ANDROID)
|
| video_decode_accelerator_.reset(new AndroidVideoDecodeAccelerator(
|
| stub_->decoder()->AsWeakPtr(),
|
|
|