Support using OpenGL ES context on desktop

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
@@ skipping 767 matching lines @@
         }
     }
     picture.reset(recorder.endRecording());
     // hairline stroked AA concave paths are fine for GPU rendering
     REPORTER_ASSERT(reporter, picture->suitableForGpuRasterization(NULL));
 }
 
 static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
                                           GrContextFactory* factory) {
 
-    GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
+    GrContext* context = factory->get(GrContextFactory::kNative_GLContextType, kNone_GrGLStandard);
 
     static const int kWidth = 100;
     static const int kHeight = 100;
 
     SkAutoTUnref<SkPicture> pict;
 
     // create a picture with the structure:
     // 1)
     //      SaveLayer
     //      Restore
@@ skipping 787 matching lines @@
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 }
 
 DEF_TEST(Canvas_EmptyBitmap, r) {
     SkBitmap dst;
     dst.allocN32Pixels(10, 10);
     SkCanvas canvas(dst);
 
     test_draw_bitmaps(&canvas);
 }