Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1453)

Unified Diff: content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/vr/vr_type_converters.cc ('k') | content/shell/android/shell_jni_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc
diff --git a/content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc b/content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc
index 7d2de96c77bf7585b89a4eb3f643cd7a938fb934..30481ee647cd693f95320801c61598871bb1324e 100644
--- a/content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc
+++ b/content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc
@@ -9,13 +9,14 @@
#include "content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.h"
-#include <sys/mman.h>
#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
#include <stdio.h>
+#include <sys/mman.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"
@@ -106,12 +107,12 @@ jboolean RunChecks(bool in_browser_process, bool need_relros) {
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
« no previous file with comments | « content/renderer/vr/vr_type_converters.cc ('k') | content/shell/android/shell_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698