Reland "Add --skip_cpu and --skip_gpu options to tests"

tests/Test.h

Index: tests/Test.h
diff --git a/tests/Test.h b/tests/Test.h
index 2dc7c66f7c2e2833eb2639b26989a73f06be93e0..0a9c306b15963c4d1c611cbd13243f469c0c4edc 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -64,7 +64,7 @@ namespace skiatest {
 
         static SkString GetResourcePath();
 
-        virtual bool isThreadsafe() const { return true; }
+        virtual bool isGPUTest() const { return false; }
 
     protected:
         virtual void onGetName(SkString*) = 0;
@@ -82,7 +82,7 @@ namespace skiatest {
         GpuTest() : Test() {}
         static GrContextFactory* GetGrContextFactory();
         static void DestroyContexts();
-        virtual bool isThreadsafe() const { return false; }
+        virtual bool isGPUTest() const { return true; }
     private:
     };