services/ui: Revert CLs that broke Windows.

services/ui/common/gpu_service.cc

 // Copyright 2016 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/common/gpu_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
@@ skipping 34 matching lines @@
   CHECK(io_thread_.StartWithOptions(thread_options));
 }
 
 GpuService::~GpuService() {
   DCHECK(IsMainThread());
   if (gpu_channel_)
     gpu_channel_->DestroyChannel();
 }
 
 // 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);
 }
 
 // static
 void GpuService::Terminate() {
   DCHECK(g_gpu_service);
   delete g_gpu_service;
   g_gpu_service = nullptr;
@@ skipping 167 matching lines @@
   MojoResult result = mojo::UnwrapSharedMemoryHandle(
       std::move(handle), &platform_handle, &shared_memory_size, &readonly);
   if (result != MOJO_RESULT_OK)
     return nullptr;
   DCHECK_EQ(shared_memory_size, size);
 
   return base::MakeUnique<base::SharedMemory>(platform_handle, readonly);
 }
 
 }  // namespace ui