Convert surfaces/service and dependents to MGL

gpu/command_buffer/build_gles2_cmd_buffer.py

Index: gpu/command_buffer/build_gles2_cmd_buffer.py
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 512891ec035979e7079045c5717719d7e997dc30..267c65810dd7e51ea32466cebb23ca83c291ee50 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -4371,7 +4371,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
 
     is_mojo_extension = func.GetInfo("extension") in _MOJO_EXPOSED_EXTENSIONS
     if func.IsCoreGLFunction() or is_mojo_extension:
-      file.Write("MojoGLES2MakeCurrent(context_);");
+      file.Write("MGLMakeCurrent(context_);");
       func_return = "gl" + func.original_name + "(" + \
           func.MakeOriginalArgString("") + ");"
       if func.original_name == "ResizeCHROMIUM":
@@ -10159,13 +10159,13 @@ extern const NameToFunc g_gles2_function_table[] = {
 
     code = """
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "mojo/public/c/gles2/gles2.h"
+#include "mojo/public/c/gpu/MGL/mgl.h"
 
 namespace mojo {
 
 class MojoGLES2Impl : public gpu::gles2::GLES2Interface {
  public:
-  explicit MojoGLES2Impl(MojoGLES2Context context) {
+  explicit MojoGLES2Impl(MGLContext context) {
     context_ = context;
   }
   ~MojoGLES2Impl() override {}
@@ -10175,7 +10175,7 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface {
       func.WriteMojoGLES2ImplHeader(file)
     code = """
  private:
-  MojoGLES2Context context_;
+  MGLContext context_;
 };
 
 }  // namespace mojo
@@ -10194,7 +10194,7 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface {
 #include "mojo/gpu/mojo_gles2_impl_autogen.h"
 
 #include "base/logging.h"
-#include "mojo/public/c/gles2/gles2.h"
+#include "mojo/public/c/gpu/MGL/mgl.h"
 #include "mojo/public/c/gpu/MGL/mgl_onscreen.h"
 
 #define GL_GLEXT_PROTOTYPES