Switch to standard integer types in media/, take 2.

media/cast/sender/congestion_control.cc

 // 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.
 
 // The purpose of this file is determine what bitrate to use for mirroring.
 // Ideally this should be as much as possible, without causing any frames to
 // arrive late.
 
 // The current algorithm is to measure how much bandwidth we've been using
 // recently. We also keep track of how much data has been queued up for sending
 // in a virtual "buffer" (this virtual buffer represents all the buffers between
 // the sender and the receiver, including retransmissions and so forth.)
 // If we estimate that our virtual buffer is mostly empty, we try to use
 // more bandwidth than our recent usage, otherwise we use less.
 
 #include "media/cast/sender/congestion_control.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/constants.h"
 
 namespace media {
 namespace cast {
 
 class AdaptiveCongestionControl : public CongestionControl {
  public:
   AdaptiveCongestionControl(base::TickClock* clock,
@@ skipping 332 matching lines @@
                     empty_buffer_fraction);
   bits_per_second = std::min(bits_per_second, soft_max_bitrate);
   bits_per_second = std::max(bits_per_second, min_bitrate_configured_);
   bits_per_second = std::min(bits_per_second, max_bitrate_configured_);
 
   return bits_per_second;
 }
 
 }  // namespace cast
 }  // namespace media