Move mojo/public/c/gpu/* to mojo/public/c/include.

mojo/gles2/BUILD.gn

 # 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.
 
 import("//testing/test.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 config("mojo_use_gles2") {
   defines = [ "MOJO_USE_GLES2_IMPL" ]
 }
@@ skipping 12 matching lines @@
     "gles2_context.h",
   ]
 
   deps = [
     "//base",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_cmd_helper_sources",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/common",
+    "//mojo/public/c:MGL",
+    "//mojo/public/c:MGL_echo",
+    "//mojo/public/c:MGL_onscreen",
+    "//mojo/public/c:MGL_signal_sync_point",
     "//mojo/public/c:system",
-    "//mojo/public/c/gpu:MGL",
-    "//mojo/public/c/gpu:MGL_echo",
-    "//mojo/public/c/gpu:MGL_onscreen",
-    "//mojo/public/c/gpu:MGL_signal_sync_point",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//mojo/services/gpu/interfaces",
     "//services/gles2:lib",
   ]
 }
 
 source_set("gles2") {
   sources = [
     "gles2_impl.cc",
   ]
 
-  defines = [
-    "GL_GLEXT_PROTOTYPES",
-    "MOJO_GLES2_IMPLEMENTATION",
-  ]
+  defines = [ "GL_GLEXT_PROTOTYPES" ]
 
   configs += [
     ":gles2_use_mojo",
     ":mojo_use_gles2",
   ]
   public_configs = [ ":gles2_use_mojo" ]
   all_dependent_configs = [ ":mojo_use_gles2" ]
 
   deps = [
     ":control_thunks",
     "//gpu/command_buffer/client:gles2_interface",
-    "//mojo/public/c/gpu:GLES2",
-    "//mojo/public/c/gpu:MGL",
+    "//mojo/public/c:GLES2",
+    "//mojo/public/c:MGL",
   ]
 }
 
 source_set("mgl") {
   sources = [
     "mgl_impl.cc",
   ]
 
   configs += [ ":gles2_use_mojo" ]
 
   deps = [
     ":control_thunks",
     ":gles2",
-    "//mojo/public/c/gpu:MGL",
-    "//mojo/public/c/gpu:MGL_onscreen",
+    "//mojo/public/c:MGL",
+    "//mojo/public/c:MGL_onscreen",
     "//mojo/public/cpp/system",
   ]
 }
 
 test("mgl_unittests") {
   deps = [
     ":mgl",
     "//mojo/edk/base_edk",
     "//mojo/edk/system",
     "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/c/gpu:MGL",
+    "//mojo/public/c:MGL",
     "//mojo/public/cpp/environment:standalone",
     "//testing/gtest:gtest",
   ]
 
   sources = [
     "mgl_unittest.cc",
   ]
 }