Use the chrome gpu command buffer on Windows for mus

services/ui/service.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/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
   std::unique_ptr<mojom::DisplayManagerRequest> dm_request;
 };
 
 struct Service::UserState {
   std::unique_ptr<clipboard::ClipboardImpl> clipboard;
   std::unique_ptr<ws::WindowTreeHostFactory> window_tree_host_factory;
 };
 
 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) {
 }
 
 Service::~Service() {
   // Destroy |window_server_| first, since it depends on |event_source_|.
   // WindowServer (or more correctly its Displays) may have state that needs to
   // be destroyed before GpuState as well.
   window_server_.reset();
 
@@ skipping 46 matching lines @@
                       const shell::Identity& identity,
                       uint32_t id) {
   platform_display_init_params_.surfaces_state = new SurfacesState;
 
   base::PlatformThread::SetName("mus");
   tracing_.Initialize(connector, identity.name());
   TRACE_EVENT0("mus", "Service::Initialize started");
 
   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_)
     ui::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
 
   InitializeResources(connector);
 
 #if defined(USE_OZONE)
   // The ozone platform can provide its own event source. So initialize the
@@ skipping 205 matching lines @@
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 
   if (touch_controller_)
     touch_controller_->UpdateTouchTransforms();
 }
 
 }  // namespace ui