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

media/base/channel_mixer_unittest.cc

 // Copyright (c) 2012 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.
 
 // MSVC++ requires this to be set before any other includes to get M_SQRT1_2.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/audio_bus.h"
 #include "media/base/channel_mixer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // Number of frames to test with.
 enum { kFrames = 16 };
@@ skipping 154 matching lines @@
                          kStereoToMonoValues, arraysize(kStereoToMonoValues)),
     ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, 2,
                          CHANNEL_LAYOUT_DISCRETE, 5,
                          kStereoToMonoValues, arraysize(kStereoToMonoValues)),
     ChannelMixerTestData(CHANNEL_LAYOUT_DISCRETE, 5,
                          CHANNEL_LAYOUT_DISCRETE, 2,
                          kFiveDiscreteValues, arraysize(kFiveDiscreteValues))
 ));
 
 }  // namespace media