Refactor read and write buffers.

tests/ColorFilterTest.cpp

Index: tests/ColorFilterTest.cpp
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index e8cf8ba019fc0db1cad85a50cb8dd1b0ff83a8cf..f3f6a0a8e890f73d2752b6ef4b869276bf746e64 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -9,22 +9,22 @@
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkLumaColorFilter.h"
-#include "SkOrderedReadBuffer.h"
-#include "SkOrderedWriteBuffer.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 #include "SkRandom.h"
 #include "SkXfermode.h"
 #include "Test.h"
 
 static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) {
-    SkOrderedWriteBuffer wb;
+    SkWriteBuffer wb;
     wb.writeFlattenable(obj);
 
-    size_t size = wb.size();
+    size_t size = wb.bytesWritten();
     SkAutoSMalloc<1024> storage(size);
     // make a copy into storage
     wb.writeToMemory(storage.get());
 
-    SkOrderedReadBuffer rb(storage.get(), size);
+    SkReadBuffer rb(storage.get(), size);
     return rb.readColorFilter();
 }