Refactor read and write buffers.

tests/BitmapHeapTest.cpp

Index: tests/BitmapHeapTest.cpp
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp
index 80591054db3a339d5ae02ef00bca38c5848eb717..da41f477f7fb492be9f103de894a8c00a1aed58a 100644
--- a/tests/BitmapHeapTest.cpp
+++ b/tests/BitmapHeapTest.cpp
@@ -9,14 +9,14 @@
 #include "SkBitmapHeap.h"
 #include "SkColor.h"
 #include "SkFlattenable.h"
-#include "SkOrderedWriteBuffer.h"
+#include "SkWriteBuffer.h"
 #include "SkPictureFlat.h"
 #include "SkRefCnt.h"
 #include "SkShader.h"
 #include "Test.h"
 
 struct SkShaderTraits {
-    static void flatten(SkOrderedWriteBuffer& buffer, const SkShader& shader) {
+    static void flatten(SkWriteBuffer& buffer, const SkShader& shader) {
         buffer.writeFlattenable(&shader);
     }
 };