| Index: content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.cc b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| index c3d121342b7bea41fd05b4f18ec8e5a93874c0d4..124b009b34576c3054c51df6d923c83f7dd77744 100644
|
| --- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| +++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
|
| @@ -10,7 +10,7 @@
|
| #include "build/build_config.h"
|
| #include "cc/output/context_provider.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| -#include "components/display_compositor/gl_helper.h"
|
| +#include "components/viz/display_compositor/gl_helper.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/test/in_process_context_factory.h"
|
| @@ -27,8 +27,7 @@ NoTransportImageTransportFactory::NoTransportImageTransportFactory()
|
| }
|
|
|
| NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
|
| - std::unique_ptr<display_compositor::GLHelper> lost_gl_helper =
|
| - std::move(gl_helper_);
|
| + std::unique_ptr<viz::GLHelper> lost_gl_helper = std::move(gl_helper_);
|
| context_factory_->SendOnLostResources();
|
| }
|
|
|
| @@ -46,11 +45,11 @@ NoTransportImageTransportFactory::GetFrameSinkManagerHost() {
|
| return frame_sink_manager_host_.get();
|
| }
|
|
|
| -display_compositor::GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
|
| +viz::GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
|
| if (!gl_helper_) {
|
| context_provider_ = context_factory_->SharedMainThreadContextProvider();
|
| - gl_helper_.reset(new display_compositor::GLHelper(
|
| - context_provider_->ContextGL(), context_provider_->ContextSupport()));
|
| + gl_helper_.reset(new viz::GLHelper(context_provider_->ContextGL(),
|
| + context_provider_->ContextSupport()));
|
| }
|
| return gl_helper_.get();
|
| }
|
|
|