Revert of Initial cleanup of cricket::VideoFrame.

webrtc/media/base/fakevideocapturer.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 61 matching lines @@
     return CaptureCustomFrame(width, height, 33333333, fourcc);
   }
   bool CaptureCustomFrame(int width,
                           int height,
                           int64_t timestamp_interval,
                           uint32_t fourcc) {
     if (!running_) {
       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.
     }
     if (size == 0u) {
       return false;  // Width and/or Height were zero.
     }
 
     cricket::CapturedFrame frame;
     frame.width = width;
     frame.height = height;
@@ skipping 58 matching lines @@
   bool running_;
   int64_t initial_unix_timestamp_;
   int64_t next_timestamp_;
   bool is_screencast_;
   webrtc::VideoRotation rotation_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEVIDEOCAPTURER_H_