Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 363f9f078c2b1313ad6f280dd2986065e7da4a6c..34f8a961e3f4c503182c95e49e2efad9bfaa2d40 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -70,8 +70,6 @@
 DEFINE_bool(simpleCodec, false, "Only decode images to native scale");
 
 using namespace DM;
-using sk_gpu_test::GrContextFactory;
-using sk_gpu_test::GLContext;
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -1413,7 +1411,7 @@
 namespace skiatest {
 namespace {
 typedef void(*TestWithGrContext)(skiatest::Reporter*, GrContext*);
-typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLContext*);
+typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, SkGLContext*);
 #if SK_SUPPORT_GPU
 template<typename T>
 void call_test(T test, skiatest::Reporter* reporter, const GrContextFactory::ContextInfo& context);