Have GMs read the GrContext via a setter/getter rather than a global.

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 018dfe6cedb4678bb6b9c0c534bdc6533fa879ed..0d8d734565c5814ac06572bddc8c885f843f39ae 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1478,8 +1478,7 @@ static void SetGr(GrContext* grContext) {
 /**
  * Gets the global GrContext, can be called by GM tests.
  */
-GrContext* GetGr();
-GrContext* GetGr() {
+static GrContext* GetGr() {
     return gGrContext.get();
 }
 
@@ -1500,9 +1499,6 @@ public:
 private:
     GrContext* fOld;
 };
-#else
-GrContext* GetGr();
-GrContext* GetGr() { return NULL; }
 #endif
 }
 
@@ -1590,6 +1586,7 @@ ErrorCombination run_multiple_configs(GMMain &gmmain, GM *gm,
                     gpuTarget = auGpuTarget;
                     grSuccess = true;
                     autogr.set(gr);

[robertphillips, 2013/09/16 18:13:38]

Why not just "gr"?

[mtklein, 2013/09/16 18:17:43]

No good reason.  Got rid of GetGr() entirely.

+                    gm->setGr(GetGr());
                     // Set the user specified cache limits if non-default.
                     size_t bytes;
                     int count;