gistfile1.txt

diff --git a/platform/ozone_platform_wayland.cc b/platform/ozone_platform_wayland.cc
index a0bc70e..34e73f3 100644
--- a/platform/ozone_platform_wayland.cc
+++ b/platform/ozone_platform_wayland.cc
@@ -4,6 +4,7 @@
 
 #include "ozone/platform/ozone_platform_wayland.h"
 
+#include "media/ozone/ozone_platform.h"
 #include "ozone/ui/cursor/cursor_factory_ozone_wayland.h"
 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
 #include "ozone/ui/desktop_aura/desktop_factory_wayland.h"
@@ -23,7 +24,8 @@ namespace {
 // OzonePlatform for Wayland
 //
 // This platform is Linux with the Wayland display server.
-class OzonePlatformWayland : public OzonePlatform {
+class OzonePlatformWayland : public OzonePlatform,
+                             public media::OzonePlatform {
 
 #include "ozone/platform/ozone_platform_wayland.h"
 
+#include "media/ozone/ozone_platform.h"
 #include "ozone/ui/cursor/cursor_factory_ozone_wayland.h"
 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
 #include "ozone/ui/desktop_aura/desktop_factory_wayland.h"
@@ -23,7 +24,8 @@ namespace {
 // OzonePlatform for Wayland
 //
 // This platform is Linux with the Wayland display server.
-class OzonePlatformWayland : public OzonePlatform {
+class OzonePlatformWayland : public OzonePlatform,
+                             public media::OzonePlatform {
  public:
   OzonePlatformWayland() : wayland_proxy_display_(NULL) {}
 
@@ -41,10 +43,6 @@ class OzonePlatformWayland : public OzonePlatform {
   virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {
     return cursor_factory_ozone_.get();
   }
-  virtual media::VideoDecodeAcceleratorImpl* CreateVideoDecodeFactoryOzone(
-      const base::Callback<bool(void)>& make_context_current) OVERRIDE {
-    return new VaapiVideoDecodeAccelerator(make_context_current);
-  }
 
   virtual void InitializeUI() OVERRIDE {
     input_method_factory_.reset(
@@ -68,6 +66,14 @@ class OzonePlatformWayland : public OzonePlatform {