Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: ui/ozone/platform/test/ozone_platform_test.cc

Issue 269673005: media: Add MediaOzonePlatform support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/test/ozone_platform_test.cc
diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc
index da94ba4b3f7e1ab18de5dbd0036183b8e2451fc7..6bbd73ea522aa82ec907faa914867f8ef388f8fb 100644
--- a/ui/ozone/platform/test/ozone_platform_test.cc
+++ b/ui/ozone/platform/test/ozone_platform_test.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "content/common/gpu/media/video_decode_factory_ozone.h"
#include "ui/base/cursor/ozone/cursor_factory_ozone.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
#include "ui/gfx/ozone/impl/file_surface_factory.h"
@@ -31,6 +32,10 @@ class OzonePlatformTest : public OzonePlatform {
virtual ~OzonePlatformTest() {}
// OzonePlatform:
+ virtual content::VideoDecodeFactoryOzone* GetVideoDecodeFactoryOzone()
+ OVERRIDE {
+ return &video_decode_factory_ozone_;
+ }
virtual gfx::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {
return &surface_factory_ozone_;
}
@@ -54,6 +59,7 @@ class OzonePlatformTest : public OzonePlatform {
#endif
private:
+ content::VideoDecodeFactoryOzone video_decode_factory_ozone_;
gfx::FileSurfaceFactory surface_factory_ozone_;
ui::EventFactoryEvdev event_factory_ozone_;
ui::InputMethodContextFactoryOzone input_method_context_factory_ozone_;

Powered by Google App Engine
This is Rietveld 408576698