Switch to standard integer types in mojo/.

mojo/runner/shell_test_base_unittest.cc

Index: mojo/runner/shell_test_base_unittest.cc
diff --git a/mojo/runner/shell_test_base_unittest.cc b/mojo/runner/shell_test_base_unittest.cc
index 998d55b1d40786c90cb505ce602a08202d39ebb1..4be23bc5e55517f2d1d24c7f22ab9bfdaa9089e4 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;