Revert of Support using OpenGL ES context on desktop

dm/DMBenchTask.cpp

 #include "DMBenchTask.h"
 #include "DMUtil.h"
 #include "SkSurface.h"
 
 namespace DM {
 
 static SkString bench_name(const char* name, const char* config) {
     SkString result("bench ");
     result.appendf("%s_%s", name, config);
     return result;
@@ skipping 15 matching lines @@
     : CpuTask(reporter, tasks)
     , fBench(factory(NULL))
     , fName(bench_name(fBench->getName(), config))
     , fColorType(colorType) {}
 
 GpuBenchTask::GpuBenchTask(const char* config,
                            Reporter* reporter,
                            TaskRunner* tasks,
                            BenchRegistry::Factory factory,
                            GrContextFactory::GLContextType contextType,
-                           GrGLStandard gpuAPI,
                            int sampleCount)
     : GpuTask(reporter, tasks)
     , fBench(factory(NULL))
     , fName(bench_name(fBench->getName(), config))
     , fContextType(contextType)
-    , fGpuAPI(gpuAPI)
     , fSampleCount(sampleCount) {}
 
 bool NonRenderingBenchTask::shouldSkip() const {
     return !fBench->isSuitableFor(Benchmark::kNonRendering_Backend);
 }
 
 bool CpuBenchTask::shouldSkip() const {
     return !fBench->isSuitableFor(Benchmark::kRaster_Backend);
 }
 
@@ skipping 16 matching lines @@
 
 void CpuBenchTask::draw() {
     draw_raster(fBench.get(), fColorType);
 }
 
 void GpuBenchTask::draw(GrContextFactory* grFactory) {
     SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(),
                                          fBench->getSize().y(),
                                          kN32_SkColorType,
                                          kPremul_SkAlphaType);
-    SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, fGpuAPI, info,
-                                                  fSampleCount));
-    if (!surface) {
-        this->fail("Could not create context for the config and the api.");
-        return;
-    }
+    SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));
+
     fBench->preDraw();
     fBench->draw(1, surface->getCanvas());
 }
 
 }  // namespace DM