Switch SkPDFStream's internal storage from SkStream to SkData

src/pdf/SkPDFStream.h

Index: src/pdf/SkPDFStream.h
diff --git a/src/pdf/SkPDFStream.h b/src/pdf/SkPDFStream.h
index 6371bc187d14d9c90ed463d7734cfa67776f4d2e..8624fb643cf91e055a1f71891d2a380db5c13fc9 100644
--- a/src/pdf/SkPDFStream.h
+++ b/src/pdf/SkPDFStream.h
@@ -74,9 +74,9 @@ protected:
     void setData(SkData* data);
     void setData(SkStream* stream);
 
-    SkStream* getData() {
-        return fData.get();
-    }
+    size_t dataSize();
+
+    SkData* getData() { return fData.get(); }
 
     void setState(State state) {
         fState = state;
@@ -90,8 +90,7 @@ private:
     // Indicates what form (or if) the stream has been requested.
     State fState;
 
-    // TODO(vandebo): Use SkData (after removing deprecated constructor).
-    SkAutoTUnref<SkStream> fData;
+    SkAutoTUnref<SkData> fData;
     SkAutoTUnref<SkPDFStream> fSubstitute;
 
     typedef SkPDFDict INHERITED;