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

media/cdm/proxy_decryptor.h

 // 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.
 
 #ifndef MEDIA_CDM_PROXY_DECRYPTOR_H_
 #define MEDIA_CDM_PROXY_DECRYPTOR_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
+#include "build/build_config.h"
 #include "media/base/cdm_context.h"
 #include "media/base/decryptor.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace media {
 
 class CdmFactory;
@@ skipping 130 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PROXY_DECRYPTOR_H_