services/ui: Revert CLs that broke Windows.

services/ui/service.h

 // 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.
 
 #ifndef SERVICES_UI_SERVICE_H_
 #define SERVICES_UI_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 50 matching lines @@
 class ForwardingWindowManager;
 class WindowServer;
 }
 
 class Service
     : public shell::Service,
       public ws::WindowServerDelegate,
       public shell::InterfaceFactory<mojom::AccessibilityManager>,
       public shell::InterfaceFactory<mojom::Clipboard>,
       public shell::InterfaceFactory<mojom::DisplayManager>,
+      public shell::InterfaceFactory<mojom::Gpu>,
       public shell::InterfaceFactory<mojom::GpuService>,
       public shell::InterfaceFactory<mojom::UserAccessManager>,
       public shell::InterfaceFactory<mojom::UserActivityMonitor>,
       public shell::InterfaceFactory<mojom::WindowManagerWindowTreeFactory>,
       public shell::InterfaceFactory<mojom::WindowTreeFactory>,
       public shell::InterfaceFactory<mojom::WindowTreeHostFactory>,
       public shell::InterfaceFactory<mojom::WindowServerTest> {
  public:
   Service();
   ~Service() override;
@@ skipping 31 matching lines @@
               mojom::AccessibilityManagerRequest request) override;
 
   // shell::InterfaceFactory<mojom::Clipboard> implementation.
   void Create(const shell::Identity& remote_identity,
               mojom::ClipboardRequest request) override;
 
   // shell::InterfaceFactory<mojom::DisplayManager> implementation.
   void Create(const shell::Identity& remote_identity,
               mojom::DisplayManagerRequest request) override;
 
+  // shell::InterfaceFactory<mojom::Gpu> implementation.
+  void Create(const shell::Identity& remote_identity,
+              mojom::GpuRequest request) override;
+
   // shell::InterfaceFactory<mojom::GpuService> implementation.
   void Create(const shell::Identity& remote_identity,
               mojom::GpuServiceRequest request) override;
 
   // shell::InterfaceFactory<mojom::UserAccessManager> implementation.
   void Create(const shell::Identity& remote_identity,
               mojom::UserAccessManagerRequest request) override;
 
   // shell::InterfaceFactory<mojom::UserActivityMonitor> implementation.
   void Create(const shell::Identity& remote_identity,
@@ skipping 28 matching lines @@
   mojo::TracingImpl tracing_;
   using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>;
   PendingRequests pending_requests_;
 
   UserIdToUserState user_id_to_user_state_;
 
   // Provides input-device information via Mojo IPC.
   InputDeviceServer input_device_server_;
 
   bool test_config_;
+  bool use_chrome_gpu_command_buffer_;
 #if defined(USE_OZONE)
   std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #endif
 
   std::unique_ptr<display::PlatformScreen> platform_screen_;
   std::unique_ptr<ws::TouchController> touch_controller_;
 
   base::WeakPtrFactory<Service> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_