Revert of Store context options on caps.

src/gpu/gl/GrGLContext.h

Index: src/gpu/gl/GrGLContext.h
diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
index 50262cf44a106ca9c6742ae7555fbe2f52002f85..e84c8ecffc265cc0ab651b6a0da2da69f8e3a500 100644
--- a/src/gpu/gl/GrGLContext.h
+++ b/src/gpu/gl/GrGLContext.h
@@ -15,7 +15,7 @@
 #include "GrGLSL.h"
 #include "GrGLUtil.h"
 
-struct GrContextOptions;
+#include "SkString.h"
 
 /**
  * Encapsulates information about an OpenGL context including the OpenGL
@@ -51,7 +51,6 @@
         GrGLRenderer                        fRenderer;
         bool                                fIsMesa;
         bool                                fIsChromium;
-        const  GrContextOptions*            fContextOptions;
     };
 
     GrGLContextInfo(const ConstructorArgs& args);
@@ -75,7 +74,7 @@
      * Creates a GrGLContext from a GrGLInterface and the currently
      * bound OpenGL context accessible by the GrGLInterface.
      */
-    static GrGLContext* Create(const GrGLInterface* interface, const GrContextOptions& options);
+    static GrGLContext* Create(const GrGLInterface* interface);
 
     const GrGLInterface* interface() const { return fInterface; }