| Index: content/browser/compositor/image_transport_factory.cc
|
| diff --git a/content/browser/compositor/image_transport_factory.cc b/content/browser/compositor/image_transport_factory.cc
|
| index 66d484f51eb51bfc39629fe3201d2c6aec0195b5..e1e8175ef62946efe6baeaaf31caa56d9abb4638 100644
|
| --- a/content/browser/compositor/image_transport_factory.cc
|
| +++ b/content/browser/compositor/image_transport_factory.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/command_line.h"
|
| #include "content/browser/compositor/gpu_process_transport_factory.h"
|
| -#include "content/browser/compositor/no_transport_image_transport_factory.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/compositor_switches.h"
|
| #include "ui/gl/gl_implementation.h"
|
| @@ -33,7 +32,7 @@ void ImageTransportFactory::Initialize() {
|
| }
|
|
|
| void ImageTransportFactory::InitializeForUnitTests(
|
| - scoped_ptr<ui::ContextFactory> test_factory) {
|
| + ImageTransportFactory* factory) {
|
| DCHECK(!g_factory);
|
| DCHECK(!g_initialized_for_unit_tests);
|
| g_initialized_for_unit_tests = true;
|
| @@ -42,7 +41,7 @@ void ImageTransportFactory::InitializeForUnitTests(
|
| if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
|
| g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
|
|
|
| - SetFactory(new NoTransportImageTransportFactory(test_factory.Pass()));
|
| + SetFactory(factory);
|
| }
|
|
|
| // static
|
|
|