Index: mash/test/mash_test_suite.cc |
diff --git a/mash/test/mash_test_suite.cc b/mash/test/mash_test_suite.cc |
index df5f214e0a840d747535867842c8eaf0e556ae08..3ca3810207fca7a00dfe3d3976dc1c3d98f5b276 100644 |
--- a/mash/test/mash_test_suite.cc |
+++ b/mash/test/mash_test_suite.cc |
@@ -11,13 +11,12 @@ |
#include "cc/output/context_provider.h" |
#include "cc/surfaces/frame_sink_id_allocator.h" |
#include "cc/surfaces/surface_manager.h" |
-#include "cc/test/test_gpu_memory_buffer_manager.h" |
-#include "cc/test/test_task_graph_runner.h" |
#include "ui/aura/env.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_paths.h" |
#include "ui/compositor/compositor.h" |
#include "ui/compositor/reflector.h" |
+#include "ui/compositor/test/fake_context_factory.h" |
#include "ui/gl/gl_bindings.h" |
#include "ui/gl/gl_switches.h" |
#include "ui/gl/test/gl_surface_test_support.h" |
@@ -25,69 +24,6 @@ |
namespace mash { |
namespace test { |
-class TestContextFactory : public ui::ContextFactory, |
- public ui::ContextFactoryPrivate { |
- public: |
- TestContextFactory() : frame_sink_id_allocator_(0) {} |
- ~TestContextFactory() override {} |
- |
- private: |
- // ui::ContextFactory:: |
- void CreateCompositorFrameSink( |
- base::WeakPtr<ui::Compositor> compositor) override {} |
- scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() |
- override { |
- return nullptr; |
- } |
- void RemoveCompositor(ui::Compositor* compositor) override {} |
- bool DoesCreateTestContexts() override { return true; } |
- uint32_t GetImageTextureTarget(gfx::BufferFormat format, |
- gfx::BufferUsage usage) override { |
- return GL_TEXTURE_2D; |
- } |
- gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override { |
- return &gpu_memory_buffer_manager_; |
- } |
- cc::TaskGraphRunner* GetTaskGraphRunner() override { |
- return &task_graph_runner_; |
- } |
- void AddObserver(ui::ContextFactoryObserver* observer) override {} |
- void RemoveObserver(ui::ContextFactoryObserver* observer) override {} |
- |
- // ui::ContextFactoryPrivate: |
- std::unique_ptr<ui::Reflector> CreateReflector( |
- ui::Compositor* mirrored_compositor, |
- ui::Layer* mirroring_layer) override { |
- return nullptr; |
- } |
- void RemoveReflector(ui::Reflector* reflector) override {} |
- cc::FrameSinkId AllocateFrameSinkId() override { |
- return frame_sink_id_allocator_.NextFrameSinkId(); |
- } |
- cc::SurfaceManager* GetSurfaceManager() override { return &surface_manager_; } |
- void SetDisplayVisible(ui::Compositor* compositor, bool visible) override {} |
- void ResizeDisplay(ui::Compositor* compositor, |
- const gfx::Size& size) override {} |
- void SetDisplayColorSpace( |
- ui::Compositor* compositor, |
- const gfx::ColorSpace& blending_color_space, |
- const gfx::ColorSpace& output_color_space) override {} |
- |
- void SetAuthoritativeVSyncInterval(ui::Compositor* compositor, |
- base::TimeDelta interval) override {} |
- void SetDisplayVSyncParameters(ui::Compositor* compositor, |
- base::TimeTicks timebase, |
- base::TimeDelta interval) override {} |
- void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {} |
- |
- cc::TestTaskGraphRunner task_graph_runner_; |
- cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
- cc::FrameSinkIdAllocator frame_sink_id_allocator_; |
- cc::SurfaceManager surface_manager_; |
- |
- DISALLOW_COPY_AND_ASSIGN(TestContextFactory); |
-}; |
- |
MashTestSuite::MashTestSuite(int argc, char** argv) : TestSuite(argc, argv) {} |
MashTestSuite::~MashTestSuite() {} |
@@ -108,9 +44,9 @@ void MashTestSuite::Initialize() { |
base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); |
env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS); |
- compositor_context_factory_ = base::MakeUnique<TestContextFactory>(); |
- env_->set_context_factory(compositor_context_factory_.get()); |
- env_->set_context_factory_private(compositor_context_factory_.get()); |
+ context_factory_ = base::MakeUnique<ui::FakeContextFactory>(); |
+ env_->set_context_factory(context_factory_.get()); |
+ env_->set_context_factory_private(nullptr); |
} |
void MashTestSuite::Shutdown() { |