services/ui: Split GpuServiceInternal into gpu vs. ws pieces.

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 36 matching lines @@
 namespace gfx {
 class Rect;
 }
 
 namespace shell {
 class Connector;
 }
 
 namespace ui {
 
-class GpuServiceProxy;
 class PlatformEventSource;
 
 namespace ws {
 class ForwardingWindowManager;
 class WindowServer;
 }
 
 class Service
     : public shell::Service,
       public ws::WindowServerDelegate,
@@ skipping 101 matching lines @@
   UserIdToUserState user_id_to_user_state_;
 
   // Provides input-device information via Mojo IPC.
   InputDeviceServer input_device_server_;
 
   bool test_config_;
 #if defined(USE_OZONE)
   std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #endif
 
-  std::unique_ptr<GpuServiceProxy> gpu_proxy_;
   std::unique_ptr<display::PlatformScreen> platform_screen_;
   std::unique_ptr<ws::TouchController> touch_controller_;
   IMERegistrarImpl ime_registrar_;
   IMEServerImpl ime_server_;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_