Switch to standard integer types in content/.

content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc

 // 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.
 
 // This file implements the native methods of
 // org.content.chromium.app.LinkerTests
 // Unlike the content of linker_jni.cc, it is part of the content library and
 // can thus use base/ and the C++ STL.
 
 #include "content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.h"
 
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <sys/mman.h>
-#include <errno.h>
-#include <stdio.h>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/debug/proc_maps_linux.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "jni/LinkerTests_jni.h"
 #include "third_party/re2/src/re2/re2.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 70 matching lines @@
       // Ignore any mapping that isn't a shared RELRO.
       continue;
     }
 
     num_shared_relros++;
 
     void* region_start = reinterpret_cast<void*>(region.start);
     void* region_end = reinterpret_cast<void*>(region.end);
 
     // Check that it is mapped read-only.
-    const uint8 expected_flags = MappedMemoryRegion::READ;
-    const uint8 expected_mask = MappedMemoryRegion::READ |
-                                MappedMemoryRegion::WRITE |
-                                MappedMemoryRegion::EXECUTE;
+    const uint8_t expected_flags = MappedMemoryRegion::READ;
+    const uint8_t expected_mask = MappedMemoryRegion::READ |
+                                  MappedMemoryRegion::WRITE |
+                                  MappedMemoryRegion::EXECUTE;
 
-    uint8 region_flags = region.permissions & expected_mask;
+    uint8_t region_flags = region.permissions & expected_mask;
     if (region_flags != expected_flags) {
       LOG(ERROR)
           << prefix
           << base::StringPrintf(
                  "Shared RELRO section at %p-%p is not mapped read-only. "
                  "Protection flags are %d (%d expected)!",
                  region_start,
                  region_end,
                  region_flags,
                  expected_flags);
@@ skipping 78 matching lines @@
 
 jboolean CheckForNoSharedRelros(JNIEnv* env,
                                 const JavaParamRef<jclass>& clazz,
                                 jboolean in_browser_process) {
   return RunChecks(in_browser_process, false);
 }
 
 bool RegisterLinkerTestsJni(JNIEnv* env) { return RegisterNativesImpl(env); }
 
 }  // namespace content