Revert of Support using OpenGL ES context on desktop

tools/PictureRenderer.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef PictureRenderer_DEFINED
 #define PictureRenderer_DEFINED
 
@@ skipping 145 matching lines @@
 
     /**
      * Remove all decoded textures from the CPU caches and all uploaded textures
      * from the GPU.
      */
     void purgeTextures();
 
     /**
      * Set the backend type. Returns true on success and false on failure.
      */
-#if SK_SUPPORT_GPU
-    bool setDeviceType(SkDeviceTypes deviceType, GrGLStandard gpuAPI = kNone_GrGLStandard) {
-#else
     bool setDeviceType(SkDeviceTypes deviceType) {
-#endif
         fDeviceType = deviceType;
 #if SK_SUPPORT_GPU
         // In case this function is called more than once
         SkSafeUnref(fGrContext);
         fGrContext = NULL;
         // Set to Native so it will have an initial value.
         GrContextFactory::GLContextType glContextType = GrContextFactory::kNative_GLContextType;
 #endif
         switch(deviceType) {
             case kBitmap_DeviceType:
@@ skipping 14 matching lines @@
             case kMesa_DeviceType:
                 glContextType = GrContextFactory::kMESA_GLContextType;
                 break;
 #endif
 #endif
             default:
                 // Invalid device type.
                 return false;
         }
 #if SK_SUPPORT_GPU
-        fGrContext = fGrContextFactory.get(glContextType, gpuAPI);
+        fGrContext = fGrContextFactory.get(glContextType);
         if (NULL == fGrContext) {
             return false;
         } else {
             fGrContext->ref();
             return true;
         }
 #endif
     }
 
 #if SK_SUPPORT_GPU
@@ skipping 457 matching lines @@
     virtual SkString getConfigNameInternal() SK_OVERRIDE;
 
     typedef PictureRenderer INHERITED;
 };
 
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 
 }
 
 #endif  // PictureRenderer_DEFINED