services/ui: Revert CLs that broke Windows.

services/ui/ws/window_tree_host_factory.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/ws/window_tree_host_factory.h"
 
+#include "services/ui/gles2/gpu_state.h"
 #include "services/ui/surfaces/surfaces_state.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/window_server.h"
 
 namespace ui {
 namespace ws {
 
 WindowTreeHostFactory::WindowTreeHostFactory(
     WindowServer* window_server,
@@ skipping 15 matching lines @@
     mojom::WindowTreeClientPtr tree_client) {
   Display* display = new Display(window_server_, platform_display_init_params_);
   std::unique_ptr<DisplayBindingImpl> display_binding(
       new DisplayBindingImpl(std::move(host), display, user_id_,
                              std::move(tree_client), window_server_));
   display->Init(std::move(display_binding));
 }
 
 }  // namespace ws
 }  // namespace ui