Revert of Store context options on caps.

src/gpu/GrContextFactory.h

Index: src/gpu/GrContextFactory.h
diff --git a/src/gpu/GrContextFactory.h b/src/gpu/GrContextFactory.h
index 7fd4b77ce0bb2f7e4c6f31c8a4bce5ace05cc540..353e3d9c96ada7ec5dff59d7487008b63219187c 100644
--- a/src/gpu/GrContextFactory.h
+++ b/src/gpu/GrContextFactory.h
@@ -9,7 +9,6 @@
 #define GrContextFactory_DEFINED
 
 #include "GrContext.h"
-#include "GrContextOptions.h"
 
 #include "gl/SkGLContext.h"
 #include "SkTArray.h"
@@ -81,7 +80,7 @@
         }
     }
 
-    explicit GrContextFactory(const GrContextOptions& opts) : fGlobalOptions(opts) { }
+    explicit GrContextFactory(const GrContext::Options& opts) : fGlobalOptions(opts) { }
     GrContextFactory() { }
 
     ~GrContextFactory() { this->destroyContexts(); }
@@ -127,7 +126,7 @@
         return NULL;
     }
 
-    const GrContextOptions& getGlobalOptions() const { return fGlobalOptions; }
+    const GrContext::Options& getGlobalOptions() const { return fGlobalOptions; }
 
 private:
     struct GPUContext {
@@ -136,7 +135,7 @@
         GrContext*                fGrContext;
     };
     SkTArray<GPUContext, true>    fContexts;
-    const GrContextOptions        fGlobalOptions;
+    const GrContext::Options      fGlobalOptions;
 };
 
 #endif