services/ui: Revert CLs that broke Windows.

services/ui/common/gpu_service.cc

Index: services/ui/common/gpu_service.cc
diff --git a/services/ui/common/gpu_service.cc b/services/ui/common/gpu_service.cc
index f8bf9e79e0939d11ced35b5e1313616fe85c0011..955035a5aecc99aeece3c1b6e61409b49a0a18c7 100644
--- a/services/ui/common/gpu_service.cc
+++ b/services/ui/common/gpu_service.cc
@@ -52,6 +52,18 @@ GpuService::~GpuService() {
 }
 
 // static
+bool GpuService::UseChromeGpuCommandBuffer() {
+// TODO(penghuang): Kludge: Running with Chrome GPU command buffer by default
+// breaks unit tests on Windows
+#if defined(OS_WIN)
+  return false;
+#else
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kUseMojoGpuCommandBufferInMus);
+#endif
+}
+
+// static
 void GpuService::Initialize(shell::Connector* connector) {
   DCHECK(!g_gpu_service);
   g_gpu_service = new GpuService(connector);