Split GrGLContextInfo into GrGLContext & GrGLContextInfo

https://codereview.appspot.com/7436045/



git-svn-id: http://skia.googlecode.com/svn/trunk@7905 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 5fc74bc..96db07d 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -625,7 +625,7 @@
     SkTArray<BenchTimer*> timers(SK_ARRAY_COUNT(gConfigs));
     for (size_t i = 0; i < SK_ARRAY_COUNT(gConfigs); ++i) {
 #if SK_SUPPORT_GPU
-        SkGLContext* ctx = NULL;
+        SkGLContextHelper* ctx = NULL;
         if (kGPU_Backend == gConfigs[i].fBackend) {
             ctx = gContextFactory.getGLContext(gConfigs[i].fContextType);
         }
@@ -680,7 +680,7 @@
             configName = gConfigs[configIndex].fName;
             backend = gConfigs[configIndex].fBackend;
             GrContext* context = NULL;
-            SkGLContext* glContext = NULL;
+            SkGLContextHelper* glContext = NULL;
             BenchTimer* timer = timers[configIndex];
 
 #if SK_SUPPORT_GPU