Switch to GrGpuGLShaders (instead of GrGpuGLShaders2).

git-svn-id: http://skia.googlecode.com/svn/trunk@1251 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/include/GrConfig.h

@@ -334,10 +334,6 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); }
     #define GR_DUMP_TEXTURE_UPLOAD  0
 #endif
 
-#ifndef GR_USE_NEW_GLSHADERS
-    #define GR_USE_NEW_GLSHADERS 0
-#endif
-
 /**
  *  GR_COLLECT_STATS controls whether the GrGpu class collects stats.
  *  If not already defined then collect in debug build but not release.

gpu/src/GrGpuFactory.cpp

@@ -55,10 +55,10 @@ GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
         case kOpenGL_Shaders_GrEngine:
             GrAssert(NULL == context3D);
             {
-#if GR_USE_NEW_GLSHADERS
-                gpu = new GrGpuGLShaders;
-#else
+#if 0 // old code path, will be removed soon
                 gpu = new GrGpuGLShaders2;
+#else
+                gpu = new GrGpuGLShaders;
 #endif
             }
             break;