services/ui: Revert CLs that broke Windows.

services/ui/gles2/raster_thread_helper.h

Index: services/ui/gles2/raster_thread_helper.h
diff --git a/services/ui/public/cpp/raster_thread_helper.h b/services/ui/gles2/raster_thread_helper.h
similarity index 73%
rename from services/ui/public/cpp/raster_thread_helper.h
rename to services/ui/gles2/raster_thread_helper.h
index 8db3e658de9d6b2f01a59bf9dd395d2cedc88dc1..b485cd5dffb6b8caf1fe70934e72fc327962c681 100644
--- a/services/ui/public/cpp/raster_thread_helper.h
+++ b/services/ui/gles2/raster_thread_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_PUBLIC_CPP_RASTER_THREAD_HELPER_H_
-#define SERVICES_UI_PUBLIC_CPP_RASTER_THREAD_HELPER_H_
+#ifndef SERVICES_UI_GLES2_RASTER_THREAD_HELPER_H_
+#define SERVICES_UI_GLES2_RASTER_THREAD_HELPER_H_
 
 #include <memory>
 
@@ -14,7 +14,7 @@ class TaskGraphRunner;
 class SingleThreadTaskGraphRunner;
 }
 
-namespace ui {
+namespace gles2 {
 
 class RasterThreadHelper {
  public:
@@ -29,6 +29,6 @@ class RasterThreadHelper {
   DISALLOW_COPY_AND_ASSIGN(RasterThreadHelper);
 };
 
-}  // namespace ui
+}  // namespace gles2
 
-#endif  // SERVICES_UI_PUBLIC_CPP_RASTER_THREAD_HELPER_H_
+#endif  // SERVICES_UI_GLES2_RASTER_THREAD_HELPER_H_