services/ui: Revert CLs that broke Windows.

services/ui/surfaces/BUILD.gn

Index: services/ui/surfaces/BUILD.gn
diff --git a/services/ui/surfaces/BUILD.gn b/services/ui/surfaces/BUILD.gn
index 31a22a21e4e575141041c1edb2446abdd62465f4..6a2501ca70b6e6cceb18748c788cc370ef4fb6fe 100644
--- a/services/ui/surfaces/BUILD.gn
+++ b/services/ui/surfaces/BUILD.gn
@@ -31,6 +31,7 @@ source_set("surfaces") {
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
     "//services/ui/common:mus_common",
+    "//services/ui/gles2",
     "//services/ui/gpu",
     "//services/ui/public/interfaces",
     "//ui/gfx",
@@ -42,6 +43,8 @@ source_set("surfaces") {
     sources += [
       "direct_output_surface_ozone.cc",
       "direct_output_surface_ozone.h",
+      "ozone_gpu_memory_buffer_manager.cc",
+      "ozone_gpu_memory_buffer_manager.h",
     ]
     deps += [ "//gpu/command_buffer/common" ]
   }