Revert of Store context options on caps.

src/gpu/gl/GrGLContext.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLContext_DEFINED
 #define GrGLContext_DEFINED
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "GrGLCaps.h"
 #include "GrGLSL.h"
 #include "GrGLUtil.h"
 
-struct GrContextOptions;
+#include "SkString.h"
 
 /**
  * Encapsulates information about an OpenGL context including the OpenGL
  * version, the GrGLStandard type of the context, and GLSL version.
  */
 class GrGLContextInfo : public SkNoncopyable {
 public:
     GrGLStandard standard() const { return fInterface->fStandard; }
     GrGLVersion version() const { return fGLVersion; }
     GrGLSLGeneration glslGeneration() const { return fGLSLGeneration; }
@@ skipping 15 matching lines @@
 
 protected:
     struct ConstructorArgs {
         const GrGLInterface*                fInterface;
         GrGLVersion                         fGLVersion;
         GrGLSLGeneration                    fGLSLGeneration;
         GrGLVendor                          fVendor;
         GrGLRenderer                        fRenderer;
         bool                                fIsMesa;
         bool                                fIsChromium;
-        const  GrContextOptions*            fContextOptions;
     };
 
     GrGLContextInfo(const ConstructorArgs& args);
 
     SkAutoTUnref<const GrGLInterface>   fInterface;
     GrGLVersion                         fGLVersion;
     GrGLSLGeneration                    fGLSLGeneration;
     GrGLVendor                          fVendor;
     GrGLRenderer                        fRenderer;
     bool                                fIsMesa;
     bool                                fIsChromium;
     SkAutoTUnref<GrGLCaps>              fGLCaps;
 };
 
 /**
  * Extension of GrGLContextInfo that also provides access to GrGLInterface.
  */
 class GrGLContext : public GrGLContextInfo {
 public:
     /**
      * 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; }
 
 private:
     GrGLContext(const ConstructorArgs& args) : INHERITED(args) {}
 
     typedef GrGLContextInfo INHERITED;
 };
 
 #endif