Revert of Update Skia's YUV API

tests/YUVCacheTest.cpp

Index: tests/YUVCacheTest.cpp
diff --git a/tests/YUVCacheTest.cpp b/tests/YUVCacheTest.cpp
index b34cf060a5b184a0f84e5eba10b6d588a359def3..f3a09f116b678e3bf81edaca07fee520103141c9 100644
--- a/tests/YUVCacheTest.cpp
+++ b/tests/YUVCacheTest.cpp
@@ -32,10 +32,11 @@
     SkResourceCache cache(1024);
 
     SkYUVPlanesCache::Info yuvInfo;
-    for (int i = 0; i < 3; i++) {
-        yuvInfo.fSizeInfo.fSizes[i].fWidth = 20 * i;
-        yuvInfo.fSizeInfo.fSizes[i].fHeight = 10 * i;
-        yuvInfo.fSizeInfo.fWidthBytes[i] = 80 * i;
+    for (int i = 0; i < 3; ++i) {
+        yuvInfo.fSize[i].fWidth = 20 * i;
+        yuvInfo.fSize[i].fHeight = 10 * i;
+        yuvInfo.fSizeInMemory[i] = 800 * i;
+        yuvInfo.fRowBytes[i] = 80 * i;
     }
     yuvInfo.fColorSpace = kRec601_SkYUVColorSpace;
 
@@ -60,12 +61,10 @@
     REPORTER_ASSERT(reporter, data);
     REPORTER_ASSERT(reporter, data->size() == size);
     for (int i = 0; i < 3; ++i) {
-        REPORTER_ASSERT(reporter, yuvInfo.fSizeInfo.fSizes[i].fWidth ==
-                yuvInfoRead.fSizeInfo.fSizes[i].fWidth);
-        REPORTER_ASSERT(reporter, yuvInfo.fSizeInfo.fSizes[i].fHeight ==
-                yuvInfoRead.fSizeInfo.fSizes[i].fHeight);
-        REPORTER_ASSERT(reporter, yuvInfo.fSizeInfo.fWidthBytes[i] ==
-                yuvInfoRead.fSizeInfo.fWidthBytes[i]);
+        REPORTER_ASSERT(reporter, yuvInfo.fSize[i].fWidth == yuvInfoRead.fSize[i].fWidth);
+        REPORTER_ASSERT(reporter, yuvInfo.fSize[i].fHeight == yuvInfoRead.fSize[i].fHeight);
+        REPORTER_ASSERT(reporter, yuvInfo.fSizeInMemory[i] == yuvInfoRead.fSizeInMemory[i]);
+        REPORTER_ASSERT(reporter, yuvInfo.fRowBytes[i] == yuvInfoRead.fRowBytes[i]);
     }
     REPORTER_ASSERT(reporter, yuvInfo.fColorSpace == yuvInfoRead.fColorSpace);