Revert of Initial cleanup of cricket::VideoFrame.

webrtc/media/base/fakevideocapturer.h

Index: webrtc/media/base/fakevideocapturer.h
diff --git a/webrtc/media/base/fakevideocapturer.h b/webrtc/media/base/fakevideocapturer.h
index 6dff3904a9117fc7a99f8d84124bddc7b999ad8a..f4690806ffd1b24407ce668c54673e2fcfaf6f02 100644
--- a/webrtc/media/base/fakevideocapturer.h
+++ b/webrtc/media/base/fakevideocapturer.h
@@ -79,11 +79,12 @@
       return false;
     }
     // Currently, |fourcc| is always I420 or ARGB.
+    // TODO(fbarchard): Extend SizeOf to take fourcc.
     uint32_t size = 0u;
     if (fourcc == cricket::FOURCC_ARGB) {
       size = width * 4 * height;
     } else if (fourcc == cricket::FOURCC_I420) {
-      size = width * height + 2 * ((width + 1) / 2) * ((height + 1) / 2);
+      size = static_cast<uint32_t>(cricket::VideoFrame::SizeOf(width, height));
     } else {
       return false;  // Unsupported FOURCC.
     }