services/ui: Revert CLs that broke Windows.

services/ui/public/cpp/BUILD.gn

Index: services/ui/public/cpp/BUILD.gn
diff --git a/services/ui/public/cpp/BUILD.gn b/services/ui/public/cpp/BUILD.gn
index 001833b4fc759c60157e044507d3ae5d3242f353..fcd6927024bb5a5f2276b4dbbdda3a09b831d74d 100644
--- a/services/ui/public/cpp/BUILD.gn
+++ b/services/ui/public/cpp/BUILD.gn
@@ -17,7 +17,6 @@ source_set("cpp") {
     "lib/in_flight_change.h",
     "lib/output_surface.cc",
     "lib/property_type_converters.cc",
-    "lib/raster_thread_helper.cc",
     "lib/scoped_window_ptr.cc",
     "lib/window.cc",
     "lib/window_observer.cc",
@@ -29,7 +28,6 @@ source_set("cpp") {
     "lib/window_tree_host_factory.cc",
     "output_surface.h",
     "property_type_converters.h",
-    "raster_thread_helper.h",
     "scoped_window_ptr.h",
     "window.h",
     "window_manager_delegate.cc",
@@ -65,6 +63,7 @@ source_set("cpp") {
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/ipc/client",
     "//services/shell/public/cpp",
+    "//services/ui/gles2:lib",
     "//services/ui/public/interfaces",
     "//ui/display",
     "//ui/events",