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

content/renderer/media/webrtc/media_stream_track_metrics.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_
 #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/sequence_checker.h"
 #include "content/common/content_export.h"
+#undef FOURCC // Macro from third_party/libyuv
 #include "third_party/webrtc/api/peerconnectioninterface.h"
+#undef FOURCC  // Macro from third_party/webrtc
 
 namespace webrtc {
 class MediaStreamInterface;
 }
 
 namespace content {
 
 class MediaStreamTrackMetricsObserver;
 class RTCPeerConnectionHandler;
 
@@ skipping 73 matching lines @@
   webrtc::PeerConnectionInterface::IceConnectionState ice_state_;
 
   SEQUENCE_CHECKER(sequence_checker_);
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamTrackMetrics);
 };
 
 }  // namespace
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_