4 files changed, 1 insertions, 24 deletions
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 5c2b475ef9..683a1ac303 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -217,14 +217,5 @@ static inline unsigned SkMul16ShiftRound(unsigned a, unsigned b, int shift) {
     return (prod + (prod >> shift)) >> shift;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_DEBUG
-    class SkMath {
-    public:
-        static void UnitTest();
-    };
-#endif
-
 #endif
 
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index 2b25dcada3..aa008cb2d9 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -403,13 +403,6 @@ public:
     void dump() const;
     void toDumpString(SkString*) const;
 
-#ifdef SK_DEBUG
-  /** @cond UNIT_TEST */
-
-    static void UnitTest();
-  /** @endcond */
-#endif
-
 private:
     enum {
         /** Set if the matrix will map a rectangle to another rectangle. This
diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h
index a3c34a3ba7..498eb8f62b 100644
--- a/include/core/SkUserConfig.h
+++ b/include/core/SkUserConfig.h
@@ -118,7 +118,7 @@
     so this flag is optional.
  */
 #ifdef SK_DEBUG
-//#define SK_SUPPORT_UNITTEST
+#define SK_SUPPORT_UNITTEST
 #endif
 
 #endif
diff --git a/include/core/SkUtils.h b/include/core/SkUtils.h
index f3e33417f1..9f3b1d6f36 100644
--- a/include/core/SkUtils.h
+++ b/include/core/SkUtils.h
@@ -96,13 +96,6 @@ size_t SkUTF16_FromUnichar(SkUnichar uni, uint16_t utf16[] = NULL);
 size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues,
                            char utf8[] = NULL);
 
-class SkUtils {
-public:
-#ifdef SK_DEBUG
-    static void UnitTest();
-#endif
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkAutoTrace {