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

media/base/cdm_promise_adapter.h

 // 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.
 
 #ifndef MEDIA_BASE_CDM_PROMISE_ADAPTER_H_
 #define MEDIA_BASE_CDM_PROMISE_ADAPTER_H_
 
+#include <stdint.h>
+
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 // Helps convert CdmPromises to an integer identifier and vice versa. The
@@ skipping 33 matching lines @@
   uint32_t next_promise_id_;
   PromiseMap promises_;
 
   base::ThreadChecker thread_checker_;
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_PROMISE_ADAPTER_H_