Set Chrome command buffer to be the default GPU command buffer (was mojo command buffer)

components/mus/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 "components/mus/surfaces/surfaces_context_provider.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "components/mus/common/switches.h"
 #include "components/mus/gles2/command_buffer_driver.h"
 #include "components/mus/gles2/command_buffer_impl.h"
 #include "components/mus/gles2/command_buffer_local.h"
 #include "components/mus/gles2/gpu_state.h"
 #include "components/mus/gpu/gpu_service_mus.h"
 #include "components/mus/surfaces/surfaces_context_provider_delegate.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "ui/gl/gpu_preference.h"
 
 namespace mus {
 
 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::kUseChromeGpuCommandBufferInMus);
+      !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 142 matching lines @@
   if (delegate_)
     delegate_->OnVSyncParametersUpdated(timebase, interval);
 }
 
 void SurfacesContextProvider::SetSwapBuffersCompletionCallback(
     gl::GLSurface::SwapCompletionCallback callback) {
   swap_buffers_completion_callback_ = callback;
 }
 
 }  // namespace mus