Index: content/gpu/gpu_main.cc |
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
index c2ffd63470fbfda833198798b293c7f2a5e9272e..285be3ab008c3f3053de7ec4a650d35f2d07a9ee 100644 |
--- a/content/gpu/gpu_main.cc |
+++ b/content/gpu/gpu_main.cc |
@@ -42,7 +42,7 @@ |
#include "sandbox/win/src/sandbox.h" |
#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) |
#include "content/common/gpu/media/exynos_video_decode_accelerator.h" |
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
+#elif defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
#include "content/common/gpu/media/vaapi_wrapper.h" |
#endif |
@@ -360,7 +360,8 @@ bool WarmUpSandbox(const CommandLine& command_line) { |
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) |
ExynosVideoDecodeAccelerator::PreSandboxInitialization(); |
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
+#elif !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_WIN) && \ |
+ defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
VaapiWrapper::PreSandboxInitialization(); |
#endif |