Switch to standard integer types in mojo/.

mojo/runner/shell_test_base_unittest.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.
 
 #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"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/test_service/test_request_tracker.mojom.h"
 #include "mojo/services/test_service/test_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 163 matching lines @@
     EXPECT_FALSE(service1.encountered_error());
     EXPECT_FALSE(service2.encountered_error());
   }
   message_loop()->Run();
 }
 
 // Tests that service A and service B, both in App 1, can talk to each other
 // 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);
 }
 
 // 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);
 }
 
 // Tests that service A in App 1 can be a client of service B in App 2.
 TEST_F(ShellTestBaseTest, ConnectServiceAsClientOfSeparateApp) {
   TestServicePtr service;
   ConnectToService(test_app_url(), &service);
   service->StartTrackingRequests(message_loop()->QuitWhenIdleClosure());
@@ skipping 21 matching lines @@
   TestTimeServicePtr time_service;
 
   // Make a request to the TestService and have it contact TimeService in the
   // tracking app. Do all this with tracking enabled, meaning both services
   // are connected as clients of the TrackedRequestService.
   ConnectToService(test_app_url(), &service);
   service->StartTrackingRequests(message_loop()->QuitWhenIdleClosure());
   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.
   ConnectToService(test_app_url(), &time_service);
   time_service->StartTrackingRequests(message_loop()->QuitWhenIdleClosure());
   time_service->GetPartyTime(Callback<void(uint64_t)>());
   message_loop()->Run();
   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;
   GetReport(&reports);
   ASSERT_EQ(3U, reports.size());
   EXPECT_EQ(TestService::Name_, reports[0].service_name);
   EXPECT_EQ(6U, reports[0].total_requests);
   EXPECT_EQ(TestTimeService::Name_, reports[1].service_name);
   EXPECT_EQ(1U, reports[1].total_requests);
   EXPECT_EQ(TestTimeService::Name_, reports[2].service_name);
   EXPECT_EQ(20U, reports[2].total_requests);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace runner
 }  // namespace mojo