services/ui: Revert CLs that broke Windows.

services/ui/common/gpu_service.h

 // 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.
 
 #ifndef SERVICES_UI_COMMON_GPU_SERVICE_H_
 #define SERVICES_UI_COMMON_GPU_SERVICE_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 16 matching lines @@
 
 class MUS_COMMON_EXPORT GpuService : public gpu::GpuChannelHostFactory {
  public:
   void EstablishGpuChannel(const base::Closure& callback);
   scoped_refptr<gpu::GpuChannelHost> EstablishGpuChannelSync();
   scoped_refptr<gpu::GpuChannelHost> GetGpuChannel();
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() const {
     return gpu_memory_buffer_manager_.get();
   }
 
+  static bool UseChromeGpuCommandBuffer();
+
   // The GpuService has to be initialized in the main thread before establishing
   // the gpu channel.
   static void Initialize(shell::Connector* connector);
   // The GpuService has to be terminated in the main thread.
   static void Terminate();
   static GpuService* GetInstance();
 
  private:
   friend struct base::DefaultSingletonTraits<GpuService>;
 
@@ skipping 28 matching lines @@
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
   std::vector<base::Closure> establish_callbacks_;
   base::ConditionVariable establishing_condition_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuService);
 };
 
 }  // namespace ui
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_LIB_GPU_SERVICE_CONNECTION_H_