Switch to standard integer types in remoting/host/.

BUG=138542
TBR=wez@chromium.org

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

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

26 files changed, 69 insertions, 47 deletions

diff --git a/remoting/host/win/chromoting_module.h b/remoting/host/win/chromoting_module.h
index 867deee..4aa2821 100644
--- a/remoting/host/win/chromoting_module.h
+++ b/remoting/host/win/chromoting_module.h
@@ -9,7 +9,7 @@
 #include <atlcom.h>
 #include <atlctl.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/win/scoped_com_initializer.h"
 
diff --git a/remoting/host/win/com_security.cc b/remoting/host/win/com_security.cc
index 97e644b..22d8147 100644
--- a/remoting/host/win/com_security.cc
+++ b/remoting/host/win/com_security.cc
@@ -6,7 +6,6 @@
 
 #include <objidl.h>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/win/windows_version.h"
diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc
index e247747..950219d 100644
--- a/remoting/host/win/host_service.cc
+++ b/remoting/host/win/host_service.cc
@@ -7,8 +7,8 @@
 
 #include "remoting/host/win/host_service.h"
 
-#include <sddl.h>
 #include <windows.h>
+#include <sddl.h>
 #include <wtsapi32.h>
 
 #include "base/base_paths.h"
@@ -145,7 +145,7 @@ HostService::HostService() :
 HostService::~HostService() {
 }
 
-void HostService::OnSessionChange(uint32 event, uint32 session_id) {
+void HostService::OnSessionChange(uint32_t event, uint32_t session_id) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK_NE(session_id, kInvalidSessionId);
 
diff --git a/remoting/host/win/host_service.h b/remoting/host/win/host_service.h
index e7fbf26..58a8e56 100644
--- a/remoting/host/win/host_service.h
+++ b/remoting/host/win/host_service.h
@@ -6,9 +6,11 @@
 #define REMOTING_HOST_WIN_HOST_SERVICE_H_
 
 #include <windows.h>
+#include <stdint.h>
 
 #include <list>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
@@ -47,7 +49,7 @@ class HostService : public WtsTerminalMonitor {
   ~HostService() override;
 
   // Notifies the service of changes in session state.
-  void OnSessionChange(uint32 event, uint32 session_id);
+  void OnSessionChange(uint32_t event, uint32_t session_id);
 
   // Creates the process launcher.
   void CreateLauncher(scoped_refptr<AutoThreadTaskRunner> task_runner);
@@ -91,7 +93,7 @@ class HostService : public WtsTerminalMonitor {
 
     // Specifies ID of the attached session or |kInvalidSession| if no session
     // is attached to the WTS terminal.
-    uint32 session_id;
+    uint32_t session_id;
 
     // Points to the observer receiving notifications about the WTS terminal
     // identified by |terminal_id|.
diff --git a/remoting/host/win/launch_process_with_token.cc b/remoting/host/win/launch_process_with_token.cc
index c0ee4b8..27689ad 100644
--- a/remoting/host/win/launch_process_with_token.cc
+++ b/remoting/host/win/launch_process_with_token.cc
@@ -5,6 +5,7 @@
 #include "remoting/host/win/launch_process_with_token.h"
 
 #include <windows.h>
+#include <stddef.h>
 #include <winternl.h>
 
 #include <limits>
@@ -52,7 +53,7 @@ void CloseHandlesAndTerminateProcess(PROCESS_INFORMATION* process_information) {
 }
 
 // Connects to the executor server corresponding to |session_id|.
-bool ConnectToExecutionServer(uint32 session_id,
+bool ConnectToExecutionServer(uint32_t session_id,
                               base::win::ScopedHandle* pipe_out) {
   base::string16 pipe_name;
 
@@ -369,7 +370,7 @@ bool SendCreateProcessRequest(
 // using the default (i.e. Winlogon) token. This routine relies on undocumented
 // OS functionality and will likely not work on anything but XP or W2K3.
 bool CreateRemoteSessionProcess(
-    uint32 session_id,
+    uint32_t session_id,
     const base::FilePath::StringType& application_name,
     const base::CommandLine::StringType& command_line,
     DWORD creation_flags,
@@ -408,7 +409,7 @@ base::LazyInstance<base::Lock>::Leaky g_inherit_handles_lock =
 
 // Creates a copy of the current process token for the given |session_id| so
 // it can be used to launch a process in that session.
-bool CreateSessionToken(uint32 session_id, ScopedHandle* token_out) {
+bool CreateSessionToken(uint32_t session_id, ScopedHandle* token_out) {
   ScopedHandle session_token;
   DWORD desired_access = TOKEN_ADJUST_DEFAULT | TOKEN_ADJUST_SESSIONID |
                          TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY;
diff --git a/remoting/host/win/launch_process_with_token.h b/remoting/host/win/launch_process_with_token.h
index 55c27bf..0525d73 100644
--- a/remoting/host/win/launch_process_with_token.h
+++ b/remoting/host/win/launch_process_with_token.h
@@ -6,6 +6,7 @@
 #define REMOTING_HOST_WIN_LAUNCH_PROCESS_WITH_TOKEN_H_
 
 #include <windows.h>
+#include <stdint.h>
 #include <string>
 
 #include "base/command_line.h"
@@ -24,7 +25,8 @@ extern base::LazyInstance<base::Lock>::Leaky g_inherit_handles_lock;
 
 // Creates a copy of the current process token for the given |session_id| so
 // it can be used to launch a process in that session.
-bool CreateSessionToken(uint32 session_id, base::win::ScopedHandle* token_out);
+bool CreateSessionToken(uint32_t session_id,
+                        base::win::ScopedHandle* token_out);
 
 // Launches |binary| in the security context of the user represented by
 // |user_token|. The session ID specified by the token is respected as well.
diff --git a/remoting/host/win/rdp_client.cc b/remoting/host/win/rdp_client.cc
index 8f029ef..9c67fb4 100644
--- a/remoting/host/win/rdp_client.cc
+++ b/remoting/host/win/rdp_client.cc
@@ -5,10 +5,12 @@
 #include "remoting/host/win/rdp_client.h"
 
 #include <windows.h>
+#include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/registry.h"
 #include "net/base/ip_endpoint.h"
@@ -145,7 +147,7 @@ void RdpClient::Core::Connect(const webrtc::DesktopSize& screen_size,
       kRdpLoopbackAddress,
       kRdpLoopbackAddress + arraysize(kRdpLoopbackAddress));
   net::IPEndPoint server_endpoint(server_address,
-                                  static_cast<uint16>(server_port));
+                                  static_cast<uint16_t>(server_port));
 
   // Create the ActiveX control window.
   rdp_client_window_.reset(new RdpClientWindow(server_endpoint, terminal_id,
diff --git a/remoting/host/win/rdp_client.h b/remoting/host/win/rdp_client.h
index 6761e97..7c24efa 100644
--- a/remoting/host/win/rdp_client.h
+++ b/remoting/host/win/rdp_client.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc
index 9d18783..d9f44d1e 100644
--- a/remoting/host/win/rdp_client_unittest.cc
+++ b/remoting/host/win/rdp_client_unittest.cc
@@ -5,12 +5,13 @@
 // ATL headers have to go first.
 #include <atlbase.h>
 #include <atlhost.h>
+#include <stdint.h>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/guid.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/win/scoped_com_initializer.h"
@@ -131,7 +132,7 @@ void RdpClientTest::TearDown() {
 }
 
 void RdpClientTest::OnRdpConnected() {
-  uint32 session_id = WtsTerminalMonitor::LookupSessionId(terminal_id_);
+  uint32_t session_id = WtsTerminalMonitor::LookupSessionId(terminal_id_);
 
   std::string id;
   EXPECT_TRUE(WtsTerminalMonitor::LookupTerminalId(session_id, &id));
diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc
index 8516195..0f605cd 100644
--- a/remoting/host/win/rdp_client_window.cc
+++ b/remoting/host/win/rdp_client_window.cc
@@ -10,6 +10,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
diff --git a/remoting/host/win/rdp_client_window.h b/remoting/host/win/rdp_client_window.h
index 4b6ccda..c68f399 100644
--- a/remoting/host/win/rdp_client_window.h
+++ b/remoting/host/win/rdp_client_window.h
@@ -10,7 +10,6 @@
 #include <atlcrack.h>
 #include <atlctl.h>
 
-#include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/win/scoped_comptr.h"
diff --git a/remoting/host/win/security_descriptor.cc b/remoting/host/win/security_descriptor.cc
index 886fae92..fffefe5 100644
--- a/remoting/host/win/security_descriptor.cc
+++ b/remoting/host/win/security_descriptor.cc
@@ -5,6 +5,7 @@
 #include "remoting/host/win/security_descriptor.h"
 
 #include <sddl.h>
+#include <stdint.h>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ -50,7 +51,7 @@ ScopedSid GetLogonSid(HANDLE token) {
   if (!GetTokenInformation(token, TokenGroups, groups.get(), length, &length))
     return ScopedSid();
 
-  for (uint32 i = 0; i < groups->GroupCount; ++i) {
+  for (uint32_t i = 0; i < groups->GroupCount; ++i) {
     if ((groups->Groups[i].Attributes & SE_GROUP_LOGON_ID) ==
         SE_GROUP_LOGON_ID) {
       length = GetLengthSid(groups->Groups[i].Sid);
diff --git a/remoting/host/win/session_desktop_environment.h b/remoting/host/win/session_desktop_environment.h
index 6ae54bf..cc4b187 100644
--- a/remoting/host/win/session_desktop_environment.h
+++ b/remoting/host/win/session_desktop_environment.h
@@ -5,9 +5,9 @@
 #ifndef REMOTING_HOST_WIN_SESSION_DESKTOP_ENVIRONMENT_H_
 #define REMOTING_HOST_WIN_SESSION_DESKTOP_ENVIRONMENT_H_
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "remoting/host/me2me_desktop_environment.h"
 
diff --git a/remoting/host/win/session_input_injector.cc b/remoting/host/win/session_input_injector.cc
index 6e6be70..22c88b9 100644
--- a/remoting/host/win/session_input_injector.cc
+++ b/remoting/host/win/session_input_injector.cc
@@ -4,6 +4,8 @@
 
 #include "remoting/host/win/session_input_injector.h"
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 
@@ -11,6 +13,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/windows_version.h"
 #include "remoting/host/sas_injector.h"
diff --git a/remoting/host/win/session_input_injector.h b/remoting/host/win/session_input_injector.h
index 60a626c..f91251f 100644
--- a/remoting/host/win/session_input_injector.h
+++ b/remoting/host/win/session_input_injector.h
@@ -5,8 +5,8 @@
 #ifndef REMOTING_HOST_WIN_SESSION_INPUT_INJECTOR_H_
 #define REMOTING_HOST_WIN_SESSION_INPUT_INJECTOR_H_
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/host/input_injector.h"
diff --git a/remoting/host/win/unprivileged_process_delegate.cc b/remoting/host/win/unprivileged_process_delegate.cc
index ef6d6b3..3290d9d 100644
--- a/remoting/host/win/unprivileged_process_delegate.cc
+++ b/remoting/host/win/unprivileged_process_delegate.cc
@@ -379,7 +379,7 @@ bool UnprivilegedProcessDelegate::OnMessageReceived(
   return event_handler_->OnMessageReceived(message);
 }
 
-void UnprivilegedProcessDelegate::OnChannelConnected(int32 peer_pid) {
+void UnprivilegedProcessDelegate::OnChannelConnected(int32_t peer_pid) {
   DCHECK(CalledOnValidThread());
 
   DWORD pid = GetProcessId(worker_process_.Get());
diff --git a/remoting/host/win/unprivileged_process_delegate.h b/remoting/host/win/unprivileged_process_delegate.h
index 8de011f..086f911 100644
--- a/remoting/host/win/unprivileged_process_delegate.h
+++ b/remoting/host/win/unprivileged_process_delegate.h
@@ -5,9 +5,11 @@
 #ifndef REMOTING_HOST_WIN_UNPRIVILEGED_PROCESS_DELEGATE_H_
 #define REMOTING_HOST_WIN_UNPRIVILEGED_PROCESS_DELEGATE_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ -48,7 +50,7 @@ class UnprivilegedProcessDelegate
  private:
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
-  void OnChannelConnected(int32 peer_pid) override;
+  void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
   void ReportFatalError();
diff --git a/remoting/host/win/window_station_and_desktop.h b/remoting/host/win/window_station_and_desktop.h
index 76fe602..21c28b0 100644
--- a/remoting/host/win/window_station_and_desktop.h
+++ b/remoting/host/win/window_station_and_desktop.h
@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace remoting {
 
diff --git a/remoting/host/win/worker_process_launcher.cc b/remoting/host/win/worker_process_launcher.cc
index 6daf02f..ebb69dd 100644
--- a/remoting/host/win/worker_process_launcher.cc
+++ b/remoting/host/win/worker_process_launcher.cc
@@ -138,7 +138,7 @@ bool WorkerProcessLauncher::OnMessageReceived(
   return ipc_handler_->OnMessageReceived(message);
 }
 
-void WorkerProcessLauncher::OnChannelConnected(int32 peer_pid) {
+void WorkerProcessLauncher::OnChannelConnected(int32_t peer_pid) {
   DCHECK(CalledOnValidThread());
 
   if (!ipc_enabled_)
diff --git a/remoting/host/win/worker_process_launcher.h b/remoting/host/win/worker_process_launcher.h
index 96bef44..e263509 100644
--- a/remoting/host/win/worker_process_launcher.h
+++ b/remoting/host/win/worker_process_launcher.h
@@ -5,9 +5,11 @@
 #ifndef REMOTING_HOST_WIN_WORKER_PROCESS_LAUNCHER_H_
 #define REMOTING_HOST_WIN_WORKER_PROCESS_LAUNCHER_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ -94,7 +96,7 @@ class WorkerProcessLauncher
   // Mirrors methods of IPC::Listener to be invoked by |Delegate|. |Delegate|
   // has to validate |peer_pid| if necessary.
   bool OnMessageReceived(const IPC::Message& message);
-  void OnChannelConnected(int32 peer_pid);
+  void OnChannelConnected(int32_t peer_pid);
   void OnChannelError();
 
  private:
diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc
index ee58120..47496be 100644
--- a/remoting/host/win/worker_process_launcher_unittest.cc
+++ b/remoting/host/win/worker_process_launcher_unittest.cc
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/win/scoped_handle.h"
@@ -60,7 +62,7 @@ class MockIpcDelegate : public WorkerProcessIpcDelegate {
   ~MockIpcDelegate() override {}
 
   // WorkerProcessIpcDelegate interface.
-  MOCK_METHOD1(OnChannelConnected, void(int32));
+  MOCK_METHOD1(OnChannelConnected, void(int32_t));
   MOCK_METHOD1(OnMessageReceived, bool(const IPC::Message&));
   MOCK_METHOD1(OnPermanentError, void(int));
 
@@ -108,7 +110,7 @@ class WorkerProcessLauncherTest
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
-  void OnChannelConnected(int32 peer_pid) override;
+  void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
   // WorkerProcessLauncher::Delegate mocks
@@ -218,7 +220,7 @@ bool WorkerProcessLauncherTest::OnMessageReceived(const IPC::Message& message) {
   return event_handler_->OnMessageReceived(message);
 }
 
-void WorkerProcessLauncherTest::OnChannelConnected(int32 peer_pid) {
+void WorkerProcessLauncherTest::OnChannelConnected(int32_t peer_pid) {
   event_handler_->OnChannelConnected(peer_pid);
 }
 
diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc
index 5895f1f..4a2a30d 100644
--- a/remoting/host/win/wts_session_process_delegate.cc
+++ b/remoting/host/win/wts_session_process_delegate.cc
@@ -11,6 +11,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
@@ -51,7 +52,7 @@ class WtsSessionProcessDelegate::Core
        const std::string& channel_security);
 
   // Initializes the object returning true on success.
-  bool Initialize(uint32 session_id);
+  bool Initialize(uint32_t session_id);
 
   // Stops the object asynchronously.
   void Stop();
@@ -73,7 +74,7 @@ class WtsSessionProcessDelegate::Core
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
-  void OnChannelConnected(int32 peer_pid) override;
+  void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
   // The actual implementation of LaunchProcess()
@@ -157,7 +158,7 @@ WtsSessionProcessDelegate::Core::Core(
       target_command_(target_command.Pass()) {
 }
 
-bool WtsSessionProcessDelegate::Core::Initialize(uint32 session_id) {
+bool WtsSessionProcessDelegate::Core::Initialize(uint32_t session_id) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   // Windows XP does not support elevation.
@@ -299,7 +300,7 @@ bool WtsSessionProcessDelegate::Core::OnMessageReceived(
   return event_handler_->OnMessageReceived(message);
 }
 
-void WtsSessionProcessDelegate::Core::OnChannelConnected(int32 peer_pid) {
+void WtsSessionProcessDelegate::Core::OnChannelConnected(int32_t peer_pid) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   // Report the worker PID now if the worker process is launched indirectly.
@@ -544,7 +545,7 @@ WtsSessionProcessDelegate::~WtsSessionProcessDelegate() {
   core_->Stop();
 }
 
-bool WtsSessionProcessDelegate::Initialize(uint32 session_id) {
+bool WtsSessionProcessDelegate::Initialize(uint32_t session_id) {
   return core_->Initialize(session_id);
 }
 
diff --git a/remoting/host/win/wts_session_process_delegate.h b/remoting/host/win/wts_session_process_delegate.h
index e99db67..f3f3e09 100644
--- a/remoting/host/win/wts_session_process_delegate.h
+++ b/remoting/host/win/wts_session_process_delegate.h
@@ -5,8 +5,10 @@
 #ifndef REMOTING_HOST_WIN_WTS_SESSION_PROCESS_DELEGATE_H_
 #define REMOTING_HOST_WIN_WTS_SESSION_PROCESS_DELEGATE_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ -37,7 +39,7 @@ class WtsSessionProcessDelegate
   ~WtsSessionProcessDelegate() override;
 
   // Initializes the object returning true on success.
-  bool Initialize(uint32 session_id);
+  bool Initialize(uint32_t session_id);
 
   // WorkerProcessLauncher::Delegate implementation.
   void LaunchProcess(WorkerProcessLauncher* event_handler) override;
diff --git a/remoting/host/win/wts_terminal_monitor.cc b/remoting/host/win/wts_terminal_monitor.cc
index 6c5f845..6eb707a 100644
--- a/remoting/host/win/wts_terminal_monitor.cc
+++ b/remoting/host/win/wts_terminal_monitor.cc
@@ -7,14 +7,13 @@
 #include <windows.h>
 #include <wtsapi32.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace remoting {
 
 // Session id that does not represent any session.
-const uint32 kInvalidSessionId = 0xffffffffu;
+const uint32_t kInvalidSessionId = 0xffffffffu;
 
 const char WtsTerminalMonitor::kConsole[] = "console";
 
@@ -22,7 +21,7 @@ WtsTerminalMonitor::~WtsTerminalMonitor() {
 }
 
 // static
-bool WtsTerminalMonitor::LookupTerminalId(uint32 session_id,
+bool WtsTerminalMonitor::LookupTerminalId(uint32_t session_id,
                                           std::string* terminal_id) {
   // Fast path for the case when |session_id| is currently attached to
   // the physical console.
@@ -50,7 +49,7 @@ bool WtsTerminalMonitor::LookupTerminalId(uint32 session_id,
 }
 
 // static
-uint32 WtsTerminalMonitor::LookupSessionId(const std::string& terminal_id) {
+uint32_t WtsTerminalMonitor::LookupSessionId(const std::string& terminal_id) {
   // Use the fast path if the caller wants to get id of the session attached to
   // the physical console.
   if (terminal_id == kConsole)
@@ -65,7 +64,7 @@ uint32 WtsTerminalMonitor::LookupSessionId(const std::string& terminal_id) {
     return kInvalidSessionId;
   }
   for (DWORD i = 0; i < session_info_count; ++i) {
-    uint32 session_id = session_info[i].SessionId;
+    uint32_t session_id = session_info[i].SessionId;
 
     std::string id;
     if (LookupTerminalId(session_id, &id) && terminal_id == id) {
diff --git a/remoting/host/win/wts_terminal_monitor.h b/remoting/host/win/wts_terminal_monitor.h
index c3b5978..c5a355e 100644
--- a/remoting/host/win/wts_terminal_monitor.h
+++ b/remoting/host/win/wts_terminal_monitor.h
@@ -5,9 +5,11 @@
 #ifndef REMOTING_HOST_WIN_WTS_TERMINAL_MONITOR_H_
 #define REMOTING_HOST_WIN_WTS_TERMINAL_MONITOR_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace remoting {
@@ -15,7 +17,7 @@ namespace remoting {
 class WtsTerminalObserver;
 
 // Session id that does not represent any session.
-extern const uint32 kInvalidSessionId;
+extern const uint32_t kInvalidSessionId;
 
 class WtsTerminalMonitor {
  public:
@@ -40,12 +42,12 @@ class WtsTerminalMonitor {
   // Returns ID of the terminal connected to |session_id| in |*terminal_id|.
   // Returns false if |session_id| is not attached to the physical console or
   // does not have an assigned terminal ID.
-  static bool LookupTerminalId(uint32 session_id, std::string* terminal_id);
+  static bool LookupTerminalId(uint32_t session_id, std::string* terminal_id);
 
   // Returns ID of the session that |terminal_id| is attached.
   // |kInvalidSessionId| is returned if none of the sessions is currently
   // attahced to |client_endpoint|.
-  static uint32 LookupSessionId(const std::string& terminal_id);
+  static uint32_t LookupSessionId(const std::string& terminal_id);
 
  protected:
   WtsTerminalMonitor();
diff --git a/remoting/host/win/wts_terminal_observer.h b/remoting/host/win/wts_terminal_observer.h
index b7ec9e3..9da1620 100644
--- a/remoting/host/win/wts_terminal_observer.h
+++ b/remoting/host/win/wts_terminal_observer.h
@@ -6,8 +6,9 @@
 #define REMOTING_HOST_WIN_WTS_TERMINAL_OBSERVER_H_
 
 #include <windows.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace remoting {
 
@@ -17,7 +18,7 @@ class WtsTerminalObserver {
   virtual ~WtsTerminalObserver() {}
 
   // Called when |session_id| attaches to the console.
-  virtual void OnSessionAttached(uint32 session_id) = 0;
+  virtual void OnSessionAttached(uint32_t session_id) = 0;
 
   // Called when a session detaches from the console.
   virtual void OnSessionDetached() = 0;