ui/compositor/test/test_suite.cc - Issue 22293003: Clean up compositor initialization/destruction.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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:

Index: ui/compositor/test/test_suite.cc

diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc

index 58329f20bd263328be51a0935db1edee7abb1f88..3f89ccee9bf0fd4c3e77a3c12f2783f7fd1ff5ac 100644

--- a/ui/compositor/test/test_suite.cc

+++ b/ui/compositor/test/test_suite.cc

@@ -28,19 +28,15 @@ void CompositorTestSuite::Initialize() {

#if defined(USE_X11)

XInitThreads();

#endif

-#if defined(OS_LINUX)

- gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);

-#endif

+ CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));

base::TestSuite::Initialize();

gfx::RegisterPathProvider();

message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));

- Compositor::Initialize();

}

void CompositorTestSuite::Shutdown() {

- Compositor::Terminate();

message_loop_.reset();

base::TestSuite::Shutdown();