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

media/audio/sounds/sounds_manager.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/audio/sounds/sounds_manager.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/sounds/audio_stream_handler.h"
 
 namespace media {
 
 namespace {
 
@@ skipping 102 matching lines @@
 
 // static
 void SoundsManager::InitializeForTesting(SoundsManager* manager) {
   CHECK(!g_instance) << "SoundsManager is already initialized.";
   CHECK(manager);
   g_instance = manager;
   g_initialized_for_testing = true;
 }
 
 }  // namespace media