Index: ui/compositor/test/context_factories_for_test.cc |
diff --git a/ui/compositor/test/context_factories_for_test.cc b/ui/compositor/test/context_factories_for_test.cc |
index 6e842dd830d5f867e6c2766b36a590deeea9a669..045739d0a6551f8decb447b81569c2b6ea1a045d 100644 |
--- a/ui/compositor/test/context_factories_for_test.cc |
+++ b/ui/compositor/test/context_factories_for_test.cc |
@@ -6,7 +6,6 @@ |
#include "base/command_line.h" |
#include "base/sys_info.h" |
-#include "cc/test/test_shared_bitmap_manager.h" |
#include "ui/compositor/compositor.h" |
#include "ui/compositor/compositor_switches.h" |
#include "ui/compositor/test/in_process_context_factory.h" |
@@ -16,7 +15,6 @@ namespace { |
static ui::ContextFactory* g_implicit_factory = NULL; |
static gfx::DisableNullDrawGLBindings* g_disable_null_draw = NULL; |
-static cc::TestSharedBitmapManager* g_shared_bitmap_manager = NULL; |
} // namespace |
@@ -33,17 +31,12 @@ void InitializeContextFactoryForTests(bool enable_pixel_output) { |
g_disable_null_draw = new gfx::DisableNullDrawGLBindings; |
g_implicit_factory = new InProcessContextFactory(); |
ContextFactory::SetInstance(g_implicit_factory); |
- g_shared_bitmap_manager = new cc::TestSharedBitmapManager(); |
- Compositor::SetSharedBitmapManager(g_shared_bitmap_manager); |
} |
void TerminateContextFactoryForTests() { |
ContextFactory::SetInstance(NULL); |
delete g_implicit_factory; |
g_implicit_factory = NULL; |
- Compositor::SetSharedBitmapManager(NULL); |
- delete g_shared_bitmap_manager; |
- g_shared_bitmap_manager = NULL; |
delete g_disable_null_draw; |
g_disable_null_draw = NULL; |
} |