Revert of Store context options on caps.

src/gpu/GrTest.cpp

Index: src/gpu/GrTest.cpp
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp
index 8580661fd34c62fb3fb17d43e7cd136be27b9466..0801d03a6c59c31a10ab4266dca935be0b1bc1a1 100644
--- a/src/gpu/GrTest.cpp
+++ b/src/gpu/GrTest.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "GrTest.h"
-#include "GrContextOptions.h"
 
 #include "GrGpuResourceCacheAccess.h"
 #include "GrInOrderDrawBuffer.h"
@@ -139,9 +138,7 @@
 
 class MockGpu : public GrGpu {
 public:
-    MockGpu(GrContext* context, const GrContextOptions& options) : INHERITED(context) {
-        fCaps.reset(SkNEW_ARGS(GrCaps, (options)));
-    }
+    MockGpu(GrContext* context) : INHERITED(context) { fCaps.reset(SkNEW(GrCaps)); }
     ~MockGpu() override {}
     bool canWriteTexturePixels(const GrTexture*, GrPixelConfig srcConfig) const override {
         return true;
@@ -252,16 +249,15 @@
 };
 
 GrContext* GrContext::CreateMockContext() {
-    GrContext* context = SkNEW(GrContext);
+    GrContext* context = SkNEW_ARGS(GrContext, (Options()));
 
     context->initMockContext();
     return context;
 }
 
 void GrContext::initMockContext() {
-    GrContextOptions options;
     SkASSERT(NULL == fGpu);
-    fGpu = SkNEW_ARGS(MockGpu, (this, options));
+    fGpu = SkNEW_ARGS(MockGpu, (this));
     SkASSERT(fGpu);
     this->initCommon();