Switch to standard integer types in media/.

media/cdm/ppapi/cdm_logging.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.
 
 // Only compile this file in debug build. This gives us one more level of
 // protection that if the linker tries to link in strings/symbols appended to
 // "DLOG() <<" in release build (which it shouldn't), we'll get "undefined
 // reference" errors.
 
 #include "media/cdm/ppapi/cdm_logging.h"
 
-#include "base/basictypes.h"
+#include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 #include <mach-o/dyld.h>
 #elif defined(OS_POSIX)
 #include <sys/syscall.h>
 #include <time.h>
 #endif
 
 #if defined(OS_POSIX)
 #include <errno.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #endif
 
+#include <stdint.h>
+
 #include <iomanip>
 #include <iostream>
 
 namespace media {
 
 #if !defined(NDEBUG)
 
 namespace {
 
 // Helper functions to wrap platform differences.
 
-int32 CurrentProcessId() {
+int32_t CurrentProcessId() {
 #if defined(OS_WIN)
   return GetCurrentProcessId();
 #elif defined(OS_POSIX)
   return getpid();
 #endif
 }
 
-int32 CurrentThreadId() {
+int32_t CurrentThreadId() {
   // Pthreads doesn't have the concept of a thread ID, so we have to reach down
   // into the kernel.
 #if defined(OS_LINUX)
   return syscall(__NR_gettid);
 #elif defined(OS_ANDROID)
   return gettid();
 #elif defined(OS_SOLARIS)
   return pthread_self();
 #elif defined(OS_POSIX)
-  return reinterpret_cast<int64>(pthread_self());
+  return reinterpret_cast<int64_t>(pthread_self());
 #elif defined(OS_WIN)
-  return static_cast<int32>(::GetCurrentThreadId());
+  return static_cast<int32_t>(::GetCurrentThreadId());
 #endif
 }
 
-uint64 TickCount() {
+uint64_t TickCount() {
 #if defined(OS_WIN)
   return GetTickCount();
 #elif defined(OS_MACOSX)
   return mach_absolute_time();
 #elif defined(OS_POSIX)
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
 
-  uint64 absolute_micro =
-    static_cast<int64>(ts.tv_sec) * 1000000 +
-    static_cast<int64>(ts.tv_nsec) / 1000;
+  uint64_t absolute_micro = static_cast<int64_t>(ts.tv_sec) * 1000000 +
+                            static_cast<int64_t>(ts.tv_nsec) / 1000;
 
   return absolute_micro;
 #endif
 }
 
 }  // namespace
 
 CdmLogMessage::CdmLogMessage(const char* file, int line) {
   std::string filename(file);
   size_t last_slash_pos = filename.find_last_of("\\/");
@@ skipping 41 matching lines @@
   std::cout << std::endl;
 }
 
 #endif  // !defined(NDEBUG)
 
 std::ostream& CdmLogStream::stream() {
   return std::cout;
 }
 
 }  // namespace media