Make SkStream *not* ref counted.

include/core/SkStream.h

Index: include/core/SkStream.h
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index abd9f924038d7da72c27387494a057b4b0414531..a73448a6975284cc87e1815be38f20f613bc7600 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -8,6 +8,7 @@
 #ifndef SkStream_DEFINED
 #define SkStream_DEFINED
 
+#include "SkInstCnt.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 
@@ -36,12 +37,13 @@ class SkStreamMemory;
  *  no more data (at EOF or hit an error). The caller should *not* call again
  *  in hopes of fulfilling more of the request.
  */
-class SK_API SkStream : public SkRefCnt { //TODO: remove SkRefCnt
+class SK_API SkStream : public SkNoncopyable {
 public:
+    virtual ~SkStream() {}
     /**
      *  Attempts to open the specified file, and return a stream to it (using
-     *  mmap if available). On success, the caller must call unref() on the
-     *  returned object. On failure, returns NULL.
+     *  mmap if available). On success, the caller is responsible for deleting.
+     *  On failure, returns NULL.
      */
     static SkStreamAsset* NewFromFile(const char path[]);
 
@@ -125,9 +127,6 @@ public:
     /** Returns the starting address for the data. If this cannot be done, returns NULL. */
     //TODO: replace with virtual const SkData* getData()
     virtual const void* getMemoryBase() { return NULL; }
-
-private:
-    typedef SkRefCnt INHERITED;
 };
 
 /** SkStreamRewindable is a SkStream for which rewind and duplicate are required. */