Revert of Store context options on caps.

include/gpu/GrContext.h

Index: include/gpu/GrContext.h
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index b6fef3d80c3baca0d156776b9d3ebeb44137fbef..a6fdf75d893be2f8b8dc42499722df6732aa571c 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -20,7 +20,6 @@
 
 class GrAARectRenderer;
 class GrBatchFontCache;
-struct GrContextOptions;
 class GrDrawTarget;
 class GrFragmentProcessor;
 class GrGpu;
@@ -47,11 +46,20 @@
 public:
     SK_DECLARE_INST_COUNT(GrContext)
 
+    struct Options {
+        Options() : fDrawPathToCompressedTexture(false), fSuppressPrints(false) { }
+
+        // EXPERIMENTAL
+        // May be removed in the future, or may become standard depending
+        // on the outcomes of a variety of internal tests.
+        bool fDrawPathToCompressedTexture;
+        bool fSuppressPrints;
+    };
+
     /**
      * Creates a GrContext for a backend context.
      */
-    static GrContext* Create(GrBackend, GrBackendContext, const GrContextOptions& options);
-    static GrContext* Create(GrBackend, GrBackendContext);
+    static GrContext* Create(GrBackend, GrBackendContext, const Options* opts = NULL);
 
     /**
      * Only defined in test apps.
@@ -522,6 +530,7 @@
     GrResourceProvider* resourceProvider() { return fResourceProvider; }
     const GrResourceProvider* resourceProvider() const { return fResourceProvider; }
     GrResourceCache* getResourceCache() { return fResourceCache; }
+    bool suppressPrints() const { return fOptions.fSuppressPrints; }
 
     // Called by tests that draw directly to the context via GrDrawTarget
     void getTestTarget(GrTestTarget*);
@@ -539,6 +548,12 @@
                     GrPathRendererChain::DrawType drawType = GrPathRendererChain::kColor_DrawType,
                     GrPathRendererChain::StencilSupport* stencilSupport = NULL);
 
+    /**
+     *  This returns a copy of the the GrContext::Options that was passed to the
+     *  constructor of this class.
+     */
+    const Options& getOptions() const { return fOptions; }
+
     /** Prints cache stats to the string if GR_CACHE_STATS == 1. */
     void dumpCacheStats(SkString*) const;
     void printCacheStats() const;
@@ -584,10 +599,11 @@
 
     int                             fMaxTextureSizeOverride;
 
+    const Options                   fOptions;
     const uint32_t                  fUniqueID;
 
-    GrContext(); // init must be called after the constructor.
-    bool init(GrBackend, GrBackendContext, const GrContextOptions& options);
+    GrContext(const Options&); // init must be called after the constructor.
+    bool init(GrBackend, GrBackendContext);
     void initMockContext();
     void initCommon();