Index: ui/compositor/test/test_suite.cc |
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc |
index 8e3fdb2be5da03ed65003fd2fd487dcee07d3bca..4340bfdcfd0fefa32a4d93641e2d2f9eab7f3f94 100644 |
--- a/ui/compositor/test/test_suite.cc |
+++ b/ui/compositor/test/test_suite.cc |
@@ -26,11 +26,8 @@ CompositorTestSuite::CompositorTestSuite(int argc, char** argv) |
CompositorTestSuite::~CompositorTestSuite() {} |
void CompositorTestSuite::Initialize() { |
- bool use_threaded_compositing = CommandLine::ForCurrentProcess()-> |
- HasSwitch(switches::kUIEnableThreadedCompositing); |
#if defined(USE_X11) |
- if (use_threaded_compositing) |
- XInitThreads(); |
+ XInitThreads(); |
#endif |
#if defined(OS_LINUX) |
gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); |
@@ -41,7 +38,7 @@ void CompositorTestSuite::Initialize() { |
message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); |
CompositorTestSupport::Initialize(); |
- Compositor::Initialize(use_threaded_compositing); |
+ Compositor::Initialize(); |
} |
void CompositorTestSuite::Shutdown() { |