Revert of Let DM run unit tests.

tests/Test.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
@@ skipping 44 matching lines @@
         Reporter* getReporter() const { return fReporter; }
         void setReporter(Reporter*);
 
         const char* getName();
         void run();
         bool passed() const { return fPassed; }
         SkMSec elapsedMs() const { return fElapsed; }
 
         static SkString GetTmpDir();
 
-        static void SetResourcePath(const char*);
         static SkString GetResourcePath();
 
         virtual bool isGPUTest() const { return false; }
-        virtual void setGrContextFactory(GrContextFactory* factory) {}
 
     protected:
         virtual void onGetName(SkString*) = 0;
         virtual void onRun(Reporter*) = 0;
 
     private:
         Reporter*   fReporter;
         SkString    fName;
         bool        fPassed;
         SkMSec      fElapsed;
     };
 
     class GpuTest : public Test{
     public:
         GpuTest() : Test() {}
-
+        static GrContextFactory* GetGrContextFactory();
+        static void DestroyContexts();
         virtual bool isGPUTest() const { return true; }
-        virtual void setGrContextFactory(GrContextFactory* factory) {
-            fGrContextFactory = factory;
-        }
-
-    protected:
-        GrContextFactory* fGrContextFactory;  // Unowned.
+    private:
     };
 
     typedef SkTRegistry<Test*(*)(void*)> TestRegistry;
 }  // namespace skiatest
 
 /*
     Use the following macros to make use of the skiatest classes, e.g.
 
     #include "Test.h"
 
@@ skipping 58 matching lines @@
     static void name(skiatest::Reporter*, GrContextFactory*);      \
     namespace skiatest {                                           \
     class name##Class : public GpuTest {                           \
     public:                                                        \
         static Test* Factory(void*) { return SkNEW(name##Class); } \
     protected:                                                     \
         virtual void onGetName(SkString* name) SK_OVERRIDE {       \
             name->set(#name);                                      \
         }                                                          \
         virtual void onRun(Reporter* r) SK_OVERRIDE {              \
-            name(r, fGrContextFactory);                            \
+            name(r, GetGrContextFactory());                        \
         }                                                          \
     };                                                             \
     static TestRegistry gReg_##name##Class(name##Class::Factory);  \
     }                                                              \
     static void name(skiatest::Reporter* reporter, GrContextFactory* factory)
 
 #endif