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

media/base/channel_layout.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.
 
 #include "media/base/channel_layout.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace media {
 
 static const int kLayoutToChannels[] = {
     0,   // CHANNEL_LAYOUT_NONE
     0,   // CHANNEL_LAYOUT_UNSUPPORTED
     1,   // CHANNEL_LAYOUT_MONO
     2,   // CHANNEL_LAYOUT_STEREO
     3,   // CHANNEL_LAYOUT_2_1
     3,   // CHANNEL_LAYOUT_SURROUND
@@ skipping 238 matching lines @@
     case CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC:
       return "STEREO_AND_KEYBOARD_MIC";
     case CHANNEL_LAYOUT_4_1_QUAD_SIDE:
       return "4.1_QUAD_SIDE";
   }
   NOTREACHED() << "Invalid channel layout provided: " << layout;
   return "";
 }
 
 }  // namespace media