5 files changed, 4 insertions, 11 deletions
diff --git a/include/core/SkGraphics.h b/include/core/SkGraphics.h
index cb06128..1862a2b 100644
--- a/include/core/SkGraphics.h
+++ b/include/core/SkGraphics.h
@@ -21,7 +21,7 @@
 
 class SkGraphics {
 public:
-    static void Init(bool runUnitTests);
+    static void Init();
     static void Term();
 
     /** Return the (approximate) number of bytes used by the font cache.
diff --git a/include/core/SkPathMeasure.h b/include/core/SkPathMeasure.h
index 5ab97ca..2d94ae2 100644
--- a/include/core/SkPathMeasure.h
+++ b/include/core/SkPathMeasure.h
@@ -80,7 +80,6 @@ public:
 
 #ifdef SK_DEBUG
     void    dump();
-    static void UnitTest();
 #endif
 
 private:
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 26ef43f..3a82991 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -68,8 +68,6 @@ public:
     bool     readBool() { return this->readU8() != 0; }
     SkScalar readScalar();
     size_t   readPackedUInt();
-
-    static void UnitTest();
 };
 
 class SkWStream : SkNoncopyable {
@@ -101,8 +99,6 @@ public:
     bool    writePackedUInt(size_t);
     
     bool writeStream(SkStream* input, size_t length);
-
-    static void UnitTest();
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/core/SkTSearch.h b/include/core/SkTSearch.h
index f29e6f5..e208071 100644
--- a/include/core/SkTSearch.h
+++ b/include/core/SkTSearch.h
@@ -161,7 +161,5 @@ extern "C" {
     void SkQSort(void* base, size_t count, size_t elemSize, SkQSortCompareProc);
 }
 
-SkDEBUGCODE(void SkQSort_UnitTest();)
-
 #endif
 
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index ed45c03..bf783a3 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -110,7 +110,7 @@ public:
         typeface referencing the same font when Deserialize is called.
      */
     void serialize(SkWStream*) const;
-
+    
     /** Given the data previously written by serialize(), return a new instance
         to a typeface referring to the same font. If that font is not available,
         return null. If an instance is returned, the caller is responsible for
@@ -121,8 +121,8 @@ public:
 protected:
     /** uniqueID must be unique (please!) and non-zero
     */
-    SkTypeface(Style style, uint32_t uniqueID);
-    virtual ~SkTypeface();
+    SkTypeface(Style style, uint32_t uniqueID)
+        : fUniqueID(uniqueID), fStyle(style) {}
 
 private:
     uint32_t    fUniqueID;