Switch to standard integer types in components/, part 3 of 4.

components/sessions/core/session_service_commands.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 "components/sessions/core/session_service_commands.h"
 
+#include <stdint.h>
+#include <string.h>
+
 #include <vector>
 
 #include "base/pickle.h"
 #include "components/sessions/core/base_session_service_commands.h"
 #include "components/sessions/core/base_session_service_delegate.h"
 #include "components/sessions/core/session_command.h"
 #include "components/sessions/core/session_types.h"
 
 namespace sessions {
 
@@ skipping 21 matching lines @@
 static const SessionCommand::id_type kCommandSetTabUserAgentOverride = 18;
 static const SessionCommand::id_type kCommandSessionStorageAssociated = 19;
 static const SessionCommand::id_type kCommandSetActiveWindow = 20;
 static const SessionCommand::id_type kCommandLastActiveTime = 21;
 
 namespace {
 
 // Various payload structures.
 struct ClosedPayload {
   SessionID::id_type id;
-  int64 close_time;
+  int64_t close_time;
 };
 
 struct WindowBoundsPayload2 {
   SessionID::id_type window_id;
-  int32 x;
-  int32 y;
-  int32 w;
-  int32 h;
+  int32_t x;
+  int32_t y;
+  int32_t w;
+  int32_t h;
   bool is_maximized;
 };
 
 struct WindowBoundsPayload3 {
   SessionID::id_type window_id;
-  int32 x;
-  int32 y;
-  int32 w;
-  int32 h;
-  int32 show_state;
+  int32_t x;
+  int32_t y;
+  int32_t w;
+  int32_t h;
+  int32_t show_state;
 };
 
 typedef SessionID::id_type ActiveWindowPayload;
 
 struct IDAndIndexPayload {
   SessionID::id_type id;
-  int32 index;
+  int32_t index;
 };
 
 typedef IDAndIndexPayload TabIndexInWindowPayload;
 
 typedef IDAndIndexPayload TabNavigationPathPrunedFromBackPayload;
 
 typedef IDAndIndexPayload SelectedNavigationIndexPayload;
 
 typedef IDAndIndexPayload SelectedTabInIndexPayload;
 
 typedef IDAndIndexPayload WindowTypePayload;
 
 typedef IDAndIndexPayload TabNavigationPathPrunedFromFrontPayload;
 
 struct PinnedStatePayload {
   SessionID::id_type tab_id;
   bool pinned_state;
 };
 
 struct LastActiveTimePayload {
   SessionID::id_type tab_id;
-  int64 last_active_time;
+  int64_t last_active_time;
 };
 
 // Persisted versions of ui::WindowShowState that are written to disk and can
 // never change.
 enum PersistedWindowShowState {
   // SHOW_STATE_DEFAULT (0) never persisted.
   PERSISTED_SHOW_STATE_NORMAL = 1,
   PERSISTED_SHOW_STATE_MINIMIZED = 2,
   PERSISTED_SHOW_STATE_MAXIMIZED = 3,
   // SHOW_STATE_INACTIVE (4) never persisted.
@@ skipping 570 matching lines @@
       new SessionCommand(kCommandSetSelectedNavigationIndex, sizeof(payload)));
   memcpy(command->contents(), &payload, sizeof(payload));
   return command;
 }
 
 scoped_ptr<SessionCommand> CreateSetWindowTypeCommand(
     const SessionID& window_id,
     SessionWindow::WindowType type) {
   WindowTypePayload payload = { 0 };
   payload.id = window_id.id();
-  payload.index = static_cast<int32>(type);
+  payload.index = static_cast<int32_t>(type);
   scoped_ptr<SessionCommand> command(
       new SessionCommand( kCommandSetWindowType, sizeof(payload)));
   memcpy(command->contents(), &payload, sizeof(payload));
   return command;
 }
 
 scoped_ptr<SessionCommand> CreatePinnedStateCommand(
     const SessionID& tab_id,
     bool is_pinned) {
   PinnedStatePayload payload = { 0 };
@@ skipping 167 matching lines @@
     AddTabsToWindows(&tabs, &windows);
     SortTabsBasedOnVisualOrderAndPrune(&windows, valid_windows);
     UpdateSelectedTabIndex(valid_windows);
   }
   STLDeleteValues(&tabs);
   // Don't delete contents of windows, that is done by the caller as all
   // valid windows are added to valid_windows.
 }
 
 }  // namespace sessions