Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1879)

Unified Diff: ui/compositor/test/context_factories_for_test.cc

Issue 271843002: Remove SharedBitmapManager global in ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mojo Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/in_process_context_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/in_process_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698