Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

dm/DMGpuSupport.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef DMGpuSupport_DEFINED
 #define DMGpuSupport_DEFINED
 
@@ skipping 10 matching lines @@
 
 // Ganesh is available.  Yippee!
 
 #  include "GrContext.h"
 #  include "GrContextFactory.h"
 
 namespace DM {
 
 static const bool kGPUDisabled = false;
 
-static inline sk_sp<SkSurface> NewGpuSurface(
-        sk_gpu_test::GrContextFactory* grFactory,
-        sk_gpu_test::GrContextFactory::GLContextType type,
-        sk_gpu_test::GrContextFactory::GLContextOptions options,
-        SkImageInfo info,
-        int samples,
-        bool useDIText) {
+static inline sk_sp<SkSurface> NewGpuSurface(GrContextFactory* grFactory,
+                                             GrContextFactory::GLContextType type,
+                                             GrContextFactory::GLContextOptions options,
+                                             SkImageInfo info,
+                                             int samples,
+                                             bool useDIText) {
     uint32_t flags = useDIText ? SkSurfaceProps::kUseDeviceIndependentFonts_Flag : 0;
     SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
     return SkSurface::MakeRenderTarget(grFactory->get(type, options), SkBudgeted::kNo,
                                        info, samples, &props);
 }
 
 }  // namespace DM
 
 #else// !SK_SUPPORT_GPU
 
 // Ganesh is not available.  Fake it.
 
 enum GrGLStandard {
     kNone_GrGLStandard,
     kGL_GrGLStandard,
     kGLES_GrGLStandard
 };
 static const int kGrGLStandardCnt = 3;
 
 class GrContext {
 public:
     void dumpCacheStats(SkString*) const {}
     void dumpGpuStats(SkString*) const {}
 };
 
-namespace sk_gpu_test {
 class GrContextFactory {
 public:
     GrContextFactory() {};
     explicit GrContextFactory(const GrContextOptions&) {}
 
     typedef int GLContextType;
 
     static const GLContextType kANGLE_GLContextType         = 0,
                                kANGLE_GL_GLContextType      = 0,
                                kCommandBuffer_GLContextType = 0,
                                kDebug_GLContextType         = 0,
                                kMESA_GLContextType          = 0,
                                kNVPR_GLContextType          = 0,
                                kNative_GLContextType        = 0,
                                kNull_GLContextType          = 0;
     static const int kGLContextTypeCnt = 1;
     enum GLContextOptions {
         kNone_GLContextOptions = 0,
         kEnableNVPR_GLContextOptions = 0x1,
     };
     void destroyContexts() {}
 
     void abandonContexts() {}
 };
-}  // namespace sk_gpu_test
 
 namespace DM {
 
 static const bool kGPUDisabled = true;
 
-static inline SkSurface* NewGpuSurface(sk_gpu_test::GrContextFactory*,
-                                       sk_gpu_test::GrContextFactory::GLContextType,
-                                       sk_gpu_test::GrContextFactory::GLContextOptions,
+static inline SkSurface* NewGpuSurface(GrContextFactory*,
+                                       GrContextFactory::GLContextType,
+                                       GrContextFactory::GLContextOptions,
                                        SkImageInfo,
                                        int,
                                        bool) {
     return nullptr;
 }
 
 }  // namespace DM
 
 #endif//SK_SUPPORT_GPU
 
 #endif//DMGpuSupport_DEFINED