Snapshot of all changes to get jumbo in blink and content.

content/renderer/media_capture_from_element/canvas_capture_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media_capture_from_element/canvas_capture_handler.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/limits.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebString.h"
+#undef FOURCC // Leaky macro from both libyuv and webrtc
 #include "third_party/libyuv/include/libyuv.h"
+#undef FOURCC // Leaky macro from both libyuv and webrtc
 #include "third_party/skia/include/core/SkImage.h"
 
 namespace {
 
 using media::VideoFrame;
 
 const size_t kArgbBytesPerPixel = 4;
 
 }  // namespace
 
@@ skipping 232 matching lines @@
                            track_id, false);
   webkit_source.SetExtraData(media_stream_source.get());
 
   web_track->Initialize(webkit_source);
   web_track->SetTrackData(new MediaStreamVideoTrack(
       media_stream_source.release(),
       MediaStreamVideoSource::ConstraintsCallback(), true));
 }
 
 }  // namespace content