Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

tools/skiaserve/Request.h

Index: tools/skiaserve/Request.h
diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h
index d19c2ba801488e916acca6c4513856130cc2c858..e3bc373841a655de0bfc15f803c71f78023dbc6e 100644
--- a/tools/skiaserve/Request.h
+++ b/tools/skiaserve/Request.h
@@ -19,9 +19,7 @@
 
 #include "UrlDataManager.h"
 
-namespace sk_gpu_test {
 class GrContextFactory;
-}
 struct MHD_Connection;
 struct MHD_PostProcessor;
 
@@ -71,7 +69,7 @@
     GrContext* getContext();
 
     sk_sp<SkPicture> fPicture;
-    sk_gpu_test::GrContextFactory* fContextFactory;
+    GrContextFactory* fContextFactory;
     SkAutoTUnref<SkSurface> fSurface;
     bool fGPUEnabled;
 };