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

media/base/media.cc

 // Copyright 2013 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/media.h"
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/path_service.h"
 #include "base/synchronization/lock.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "media/base/yuv_convert.h"
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/ffmpeg/ffmpeg_common.h"
 #endif
 
@@ skipping 35 matching lines @@
 };
 
 static base::LazyInstance<MediaInitializer>::Leaky g_media_library =
     LAZY_INSTANCE_INITIALIZER;
 
 void InitializeMediaLibrary() {
   g_media_library.Get();
 }
 
 }  // namespace media