Use the chrome gpu command buffer on Windows for mus

services/ui/surfaces/surfaces_context_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/surfaces/surfaces_context_provider.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 17 matching lines @@
 
 namespace ui {
 
 SurfacesContextProvider::SurfacesContextProvider(
     gfx::AcceleratedWidget widget,
     const scoped_refptr<GpuState>& state)
     : use_chrome_gpu_command_buffer_(false),
       delegate_(nullptr),
       widget_(widget),
       command_buffer_local_(nullptr) {
-// 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 (!use_chrome_gpu_command_buffer_) {
     command_buffer_local_ = new CommandBufferLocal(this, widget_, state);
   } else {
     GpuServiceMus* service = GpuServiceMus::GetInstance();
     gpu::CommandBufferProxyImpl* shared_command_buffer = nullptr;
     gpu::GpuStreamId stream_id = gpu::GpuStreamId::GPU_STREAM_DEFAULT;
     gpu::GpuStreamPriority stream_priority = gpu::GpuStreamPriority::NORMAL;
     gpu::gles2::ContextCreationAttribHelper attributes;
     attributes.alpha_size = -1;
     attributes.depth_size = 0;
@@ skipping 140 matching lines @@
   if (delegate_)
     delegate_->OnVSyncParametersUpdated(timebase, interval);
 }
 
 void SurfacesContextProvider::SetSwapBuffersCompletionCallback(
     gl::GLSurface::SwapCompletionCallback callback) {
   swap_buffers_completion_callback_ = callback;
 }
 
 }  // namespace ui