Convert surfaces/service and dependents to MGL

mojo/gpu/mojo_context_support.cc

Index: mojo/gpu/mojo_context_support.cc
diff --git a/mojo/gpu/mojo_context_support.cc b/mojo/gpu/mojo_context_support.cc
index 40e2df860f1ac07ea0fd6f0ad5aaa28c91f98c26..948db90b44749e0120c884547455278d1a7f4219 100644
--- a/mojo/gpu/mojo_context_support.cc
+++ b/mojo/gpu/mojo_context_support.cc
@@ -6,6 +6,7 @@
 
 #include "base/callback.h"
 #include "base/logging.h"
+#include "mojo/public/c/gpu/MGL/mgl_onscreen.h"
 #include "mojo/public/c/gpu/MGL/mgl_signal_sync_point.h"
 
 namespace mojo {
@@ -18,9 +19,8 @@ void RunAndDeleteCallback(void* context) {
 }
 }
 
-MojoContextSupport::MojoContextSupport(MojoGLES2Context context)
-    : context_(context) {
-}
+MojoContextSupport::MojoContextSupport(MGLContext context)
+    : context_(context) {}
 
 MojoContextSupport::~MojoContextSupport() {
 }
@@ -41,8 +41,8 @@ void MojoContextSupport::SetSurfaceVisible(bool visible) {
 }
 
 void MojoContextSupport::Swap() {
-  MojoGLES2MakeCurrent(context_);
-  MojoGLES2SwapBuffers();
+  MGLMakeCurrent(context_);
+  MGLSwapBuffers();
 }
 
 void MojoContextSupport::PartialSwapBuffers(const gfx::Rect& sub_buffer) {