Switch to standard integer types in mojo/.

BUG=138542
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/1543603002 .

Cr-Commit-Position: refs/heads/master@{#366417}

18 files changed, 48 insertions, 14 deletions

diff --git a/mojo/runner/android/android_handler.cc b/mojo/runner/android/android_handler.cc
index ebf5953..38ffbc4 100644
--- a/mojo/runner/android/android_handler.cc
+++ b/mojo/runner/android/android_handler.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/android/android_handler.h"
 
+#include <stddef.h>
+
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
diff --git a/mojo/runner/child/native_apptest_target.cc b/mojo/runner/child/native_apptest_target.cc
index b036ce0..052040f 100644
--- a/mojo/runner/child/native_apptest_target.cc
+++ b/mojo/runner/child/native_apptest_target.cc
@@ -6,6 +6,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
diff --git a/mojo/runner/child/runner_connection.cc b/mojo/runner/child/runner_connection.cc
index 7b65845..33f530d 100644
--- a/mojo/runner/child/runner_connection.cc
+++ b/mojo/runner/child/runner_connection.cc
@@ -4,11 +4,14 @@
 
 #include "mojo/runner/child/runner_connection.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
diff --git a/mojo/runner/child/test_native_main.cc b/mojo/runner/child/test_native_main.cc
index cdfe0a0..19ea8df 100644
--- a/mojo/runner/child/test_native_main.cc
+++ b/mojo/runner/child/test_native_main.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/debug/stack_trace.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index ee6a343..fad89a6 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -4,6 +4,9 @@
 
 #include "mojo/runner/context.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
diff --git a/mojo/runner/host/child_process.cc b/mojo/runner/host/child_process.cc
index 0cf82f9..76fa739 100644
--- a/mojo/runner/host/child_process.cc
+++ b/mojo/runner/host/child_process.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/host/child_process.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/base_switches.h"
diff --git a/mojo/runner/host/child_process_host.cc b/mojo/runner/host/child_process_host.cc
index 37bda92..a648edb 100644
--- a/mojo/runner/host/child_process_host.cc
+++ b/mojo/runner/host/child_process_host.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/host/child_process_host.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
diff --git a/mojo/runner/host/child_process_host.h b/mojo/runner/host/child_process_host.h
index 3eb6880..1f4f757 100644
--- a/mojo/runner/host/child_process_host.h
+++ b/mojo/runner/host/child_process_host.h
@@ -5,6 +5,8 @@
 #ifndef MOJO_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 #define MOJO_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
diff --git a/mojo/runner/host/linux_sandbox.cc b/mojo/runner/host/linux_sandbox.cc
index c9d1323..361cdd9 100644
--- a/mojo/runner/host/linux_sandbox.cc
+++ b/mojo/runner/host/linux_sandbox.cc
@@ -10,6 +10,7 @@
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
+#include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/rand_util.h"
 #include "base/sys_info.h"
diff --git a/mojo/runner/host/native_application_support.cc b/mojo/runner/host/native_application_support.cc
index 5b53744..9369536 100644
--- a/mojo/runner/host/native_application_support.cc
+++ b/mojo/runner/host/native_application_support.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/host/native_application_support.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
diff --git a/mojo/runner/host/out_of_process_native_runner.cc b/mojo/runner/host/out_of_process_native_runner.cc
index 5c60e05..19f6e40 100644
--- a/mojo/runner/host/out_of_process_native_runner.cc
+++ b/mojo/runner/host/out_of_process_native_runner.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/host/out_of_process_native_runner.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/bind.h"
diff --git a/mojo/runner/host/out_of_process_native_runner.h b/mojo/runner/host/out_of_process_native_runner.h
index e51247e..96e1fd8 100644
--- a/mojo/runner/host/out_of_process_native_runner.h
+++ b/mojo/runner/host/out_of_process_native_runner.h
@@ -5,6 +5,8 @@
 #ifndef MOJO_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
 #define MOJO_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
 
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
diff --git a/mojo/runner/init.cc b/mojo/runner/init.cc
index bb6aff8..ace54f5 100644
--- a/mojo/runner/init.cc
+++ b/mojo/runner/init.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/init.h"
 
+#include <stdint.h>
+
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ -66,7 +68,7 @@ void WaitForDebuggerIfNecessary() {
 
 void CallLibraryEarlyInitialization(base::NativeLibrary app_library) {
   // Do whatever warming that the mojo application wants.
-  typedef void (*LibraryEarlyInitFunction)(const uint8*);
+  typedef void (*LibraryEarlyInitFunction)(const uint8_t*);
   LibraryEarlyInitFunction init_function =
       reinterpret_cast<LibraryEarlyInitFunction>(
           base::GetFunctionPointerFromNativeLibrary(app_library,
@@ -74,7 +76,7 @@ void CallLibraryEarlyInitialization(base::NativeLibrary app_library) {
   if (init_function) {
     // Get the ICU data that we prewarmed in the runner and then pass it to
     // the copy of icu in the mojo binary that we're running.
-    const uint8* icu_data = base::i18n::GetRawIcuMemory();
+    const uint8_t* icu_data = base::i18n::GetRawIcuMemory();
     init_function(icu_data);
   }
 
diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc
index f0eb95c..69e8a19 100644
--- a/mojo/runner/shell_apptest.cc
+++ b/mojo/runner/shell_apptest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
diff --git a/mojo/runner/shell_test_base_unittest.cc b/mojo/runner/shell_test_base_unittest.cc
index 998d55b..4be23bc5 100644
--- a/mojo/runner/shell_test_base_unittest.cc
+++ b/mojo/runner/shell_test_base_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "mojo/runner/shell_test_base.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/macros.h"
@@ -187,18 +190,18 @@ TEST_F(ShellTestBaseTest, ConnectMultipleInstancesPerApp) {
 // and parameters are passed around properly.
 TEST_F(ShellTestBaseTest, ConnectDifferentServicesInSingleApp) {
   // Have a TestService GetPartyTime on a TestTimeService in the same app.
-  int64 time_message;
+  int64_t time_message;
   TestServicePtr service;
   ConnectToService(test_app_url(), &service);
   service->ConnectToAppAndGetTime(test_app_url().spec(),
-                                  SetAndQuit<int64>(&time_message));
+                                  SetAndQuit<int64_t>(&time_message));
   message_loop()->Run();
 
   // Verify by hitting the TimeService directly.
   TestTimeServicePtr time_service;
   ConnectToService(test_app_url(), &time_service);
-  int64 party_time;
-  time_service->GetPartyTime(SetAndQuit<int64>(&party_time));
+  int64_t party_time;
+  time_service->GetPartyTime(SetAndQuit<int64_t>(&party_time));
   message_loop()->Run();
 
   EXPECT_EQ(time_message, party_time);
@@ -207,18 +210,18 @@ TEST_F(ShellTestBaseTest, ConnectDifferentServicesInSingleApp) {
 // Tests that a service A in App 1 can talk to service B in App 2 and
 // parameters are passed around properly.
 TEST_F(ShellTestBaseTest, ConnectDifferentServicesInDifferentApps) {
-  int64 time_message;
+  int64_t time_message;
   TestServicePtr service;
   ConnectToService(test_app_url(), &service);
   service->ConnectToAppAndGetTime("mojo:test_request_tracker_app",
-                                  SetAndQuit<int64>(&time_message));
+                                  SetAndQuit<int64_t>(&time_message));
   message_loop()->Run();
 
   // Verify by hitting the TimeService in the request tracker app directly.
   TestTimeServicePtr time_service;
   ConnectToService(GURL("mojo:test_request_tracker_app"), &time_service);
-  int64 party_time;
-  time_service->GetPartyTime(SetAndQuit<int64>(&party_time));
+  int64_t party_time;
+  time_service->GetPartyTime(SetAndQuit<int64_t>(&party_time));
   message_loop()->Run();
 
   EXPECT_EQ(time_message, party_time);
@@ -260,9 +263,9 @@ TEST_F(ShellTestBaseTest, ConnectManyClientsAndServices) {
   message_loop()->Run();
   for (int i = 0; i < 5; i++)
     service->Ping(Callback<void()>());
-  int64 time_result;
+  int64_t time_result;
   service->ConnectToAppAndGetTime("mojo:test_request_tracker_app",
-                                  SetAndQuit<int64>(&time_result));
+                                  SetAndQuit<int64_t>(&time_result));
   message_loop()->Run();
 
   // Also make a few requests to the TimeService in the test_app.
@@ -273,8 +276,8 @@ TEST_F(ShellTestBaseTest, ConnectManyClientsAndServices) {
   for (int i = 0; i < 18; i++)
     time_service->GetPartyTime(Callback<void(uint64_t)>());
   // Flush the tasks with one more to quit.
-  int64 party_time = 0;
-  time_service->GetPartyTime(SetAndQuit<int64>(&party_time));
+  int64_t party_time = 0;
+  time_service->GetPartyTime(SetAndQuit<int64_t>(&party_time));
   message_loop()->Run();
 
   std::vector<ServiceReport> reports;
diff --git a/mojo/runner/task_runners.cc b/mojo/runner/task_runners.cc
index 306cab6..8bb5993 100644
--- a/mojo/runner/task_runners.cc
+++ b/mojo/runner/task_runners.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/runner/task_runners.h"
 
+#include <stddef.h>
+
 #include "base/threading/sequenced_worker_pool.h"
 
 namespace mojo {
diff --git a/mojo/runner/tracer.cc b/mojo/runner/tracer.cc
index d709b4e..a327113 100644
--- a/mojo/runner/tracer.cc
+++ b/mojo/runner/tracer.cc
@@ -4,6 +4,7 @@
 
 #include "mojo/runner/tracer.h"
 
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <utility>
diff --git a/mojo/runner/tracer.h b/mojo/runner/tracer.h
index 6fd8b1c..bac7914 100644
--- a/mojo/runner/tracer.h
+++ b/mojo/runner/tracer.h
@@ -5,6 +5,7 @@
 #ifndef MOJO_RUNNER_TRACER_H_
 #define MOJO_RUNNER_TRACER_H_
 
+#include <stddef.h>
 #include <stdio.h>
 
 #include <string>