| Index: content/browser/compositor/test/no_transport_image_transport_factory.h
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| index 73f435a1e3270dd1510fca4e4b752315260dd298..c6de81da8d4b5d4af06d801975e8d737b86dea1f 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.h
|
| @@ -8,7 +8,6 @@
|
| #include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "base/observer_list.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/compositor/image_transport_factory.h"
|
|
|
| @@ -16,6 +15,10 @@ namespace cc {
|
| class ContextProvider;
|
| }
|
|
|
| +namespace ui {
|
| +class InProcessContextFactory;
|
| +}
|
| +
|
| namespace content {
|
|
|
| // An ImageTransportFactory that disables transport.
|
| @@ -28,8 +31,6 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
|
| ui::ContextFactory* GetContextFactory() override;
|
| cc::SurfaceManager* GetSurfaceManager() override;
|
| display_compositor::GLHelper* GetGLHelper() override;
|
| - void AddObserver(ImageTransportFactoryObserver* observer) override;
|
| - void RemoveObserver(ImageTransportFactoryObserver* observer) override;
|
| #if defined(OS_MACOSX)
|
| void SetCompositorSuspendedForRecycle(ui::Compositor* compositor,
|
| bool suspended) override {}
|
| @@ -37,10 +38,9 @@ class NoTransportImageTransportFactory : public ImageTransportFactory {
|
|
|
| private:
|
| std::unique_ptr<cc::SurfaceManager> surface_manager_;
|
| - std::unique_ptr<ui::ContextFactory> context_factory_;
|
| + std::unique_ptr<ui::InProcessContextFactory> context_factory_;
|
| scoped_refptr<cc::ContextProvider> context_provider_;
|
| std::unique_ptr<display_compositor::GLHelper> gl_helper_;
|
| - base::ObserverList<ImageTransportFactoryObserver> observer_list_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory);
|
| };
|
|
|