Cleanup GrContextFactory and make it's subclasses private

gyp/gpu.gypi

Index: gyp/gpu.gypi
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 430bac9dd7201b43be23ac837a6374f0f0b13c07..d519c6f65862610ffc520db6825aaec6c9bbd379 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -14,7 +14,6 @@
       '<(skia_include_path)/gpu/GrColor.h',
       '<(skia_include_path)/gpu/GrConfig.h',
       '<(skia_include_path)/gpu/GrContext.h',
-      '<(skia_include_path)/gpu/GrContextFactory.h',
       '<(skia_include_path)/gpu/GrCoordTransform.h',
       '<(skia_include_path)/gpu/GrFontScaler.h',
       '<(skia_include_path)/gpu/GrFragmentProcessor.h',
@@ -320,15 +319,15 @@
       '<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkMesaGLContext.h',
       '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.h',
     ],
     'skgpu_angle_gl_sources': [
       '<(skia_src_path)/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkANGLEGLContext.h',
       '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.h',
     ],
     'skgpu_debug_gl_sources': [
       '<(skia_src_path)/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
@@ -352,15 +351,15 @@
       '<(skia_src_path)/gpu/gl/debug/GrVertexArrayObj.h',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkDebugGLContext.h',
       '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h',
     ],
     'skgpu_null_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
 
       # Sk files
-      '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
       '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/SkNullGLContext.h',
     ],
   },
 }