Use the chrome gpu command buffer on Windows for mus

services/ui/service.cc

Index: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index e229e59e0ca84256788a3fa7556c4142bcf284cb..5e6a68bc4d5460dcbd4c4c35cc5bd3485c807e62 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -80,13 +80,7 @@ struct Service::UserState {
 
 Service::Service()
     : test_config_(false),
-// TODO(penghuang): Kludge: Use mojo command buffer when running on
-// Windows since chrome command buffer breaks unit tests
-#if defined(OS_WIN)
-      use_chrome_gpu_command_buffer_(false),
-#else
       use_chrome_gpu_command_buffer_(true),
-#endif
       platform_screen_(display::PlatformScreen::Create()),
       weak_ptr_factory_(this) {
 }
@@ -153,15 +147,9 @@ void Service::OnStart(shell::Connector* connector,
 
   test_config_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseTestConfig);
-// TODO(penghuang): Kludge: use mojo command buffer when running on Windows
-// since Chrome command buffer breaks unit tests
-#if defined(OS_WIN)
-  use_chrome_gpu_command_buffer_ = false;
-#else
   use_chrome_gpu_command_buffer_ =
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseMojoGpuCommandBufferInMus);
-#endif
 #if defined(USE_X11)
   XInitThreads();
   if (test_config_)