Remove SK_SUPPORT_GPU checks in tool-only code

Most of this is (obviously) not necessary to do, but once
I started, I figured I'd just get it all. Tools (nanobench,
DM, skiaserve), all GMs, benches, and unit tests, plus support
code (command line parsing and config stuff).

This is almost entirely mechanical.

Bug: skia:
Change-Id: I209500f8df8c5bd43f8298ff26440d1c4d7425fb
Reviewed-on: https://skia-review.googlesource.com/131153
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 0 insertions, 15 deletions

diff --git a/tests/Test.h b/tests/Test.h
index f74b98aa9c..97604a2c72 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -12,18 +12,7 @@
 #include "SkString.h"
 #include "SkTraceEvent.h"
 #include "SkTypes.h"
-
-#if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
-#else
-namespace sk_gpu_test {
-class GrContextFactory;
-class ContextInfo;
-class GLTestContext;
-}  // namespace sk_gpu_test
-class GrContext;
-struct GrContextOptions;
-#endif
 
 namespace skiatest {
 
@@ -133,11 +122,7 @@ typedef sk_tools::Registry<Test> TestRegistry;
     }
 */
 
-#if SK_SUPPORT_GPU
 using GrContextFactoryContextType = sk_gpu_test::GrContextFactory::ContextType;
-#else
-using GrContextFactoryContextType = int;
-#endif
 
 typedef void GrContextTestFn(Reporter*, const sk_gpu_test::ContextInfo&);
 typedef bool GrContextTypeFilterFn(GrContextFactoryContextType);