Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

tools/skiaserve/Request.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef Request_DEFINED
 #define Request_DEFINED
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #endif
 
 #include "SkDebugCanvas.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkSurface.h"
 
 #include "UrlDataManager.h"
 
-namespace sk_gpu_test {
 class GrContextFactory;
-}
 struct MHD_Connection;
 struct MHD_PostProcessor;
 
 struct UploadContext {
     SkDynamicMemoryWStream fStream;
     MHD_PostProcessor* fPostProcessor;
     MHD_Connection* connection;
 };
 
 struct Request {
@@ skipping 29 matching lines @@
 
 private:
     SkData* writeCanvasToPng(SkCanvas* canvas);
     void drawToCanvas(int n, int m = -1);
     SkSurface* createCPUSurface();
     SkSurface* createGPUSurface();
     SkIRect getBounds();
     GrContext* getContext();
 
     sk_sp<SkPicture> fPicture;
-    sk_gpu_test::GrContextFactory* fContextFactory;
+    GrContextFactory* fContextFactory;
     SkAutoTUnref<SkSurface> fSurface;
     bool fGPUEnabled;
 };
 
 #endif