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

components/sessions/core/session_backend.cc

 // Copyright 2012 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_backend.h"
 
+#include <stdint.h>
+
 #include <limits>
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread_restrictions.h"
+#include "build/build_config.h"
 
 using base::TimeTicks;
 
 namespace sessions {
 
 // File version number.
-static const int32 kFileCurrentVersion = 1;
+static const int32_t kFileCurrentVersion = 1;
 
 // The signature at the beginning of the file = SSNS (Sessions).
-static const int32 kFileSignature = 0x53534E53;
+static const int32_t kFileSignature = 0x53534E53;
 
 namespace {
 
 // The file header is the first bytes written to the file,
 // and is used to identify the file as one written by us.
 struct FileHeader {
-  int32 signature;
-  int32 version;
+  int32_t signature;
+  int32_t version;
 };
 
 // SessionFileReader ----------------------------------------------------------
 
 // SessionFileReader is responsible for reading the set of SessionCommands that
 // describe a Session back from a file. SessionFileRead does minimal error
 // checking on the file (pretty much only that the header is valid).
 
 class SessionFileReader {
  public:
@@ skipping 225 matching lines @@
 
 void SessionBackend::MoveCurrentSessionToLastSession() {
   Init();
   current_session_file_.reset(NULL);
 
   const base::FilePath current_session_path = GetCurrentSessionPath();
   const base::FilePath last_session_path = GetLastSessionPath();
   if (base::PathExists(last_session_path))
     base::DeleteFile(last_session_path, false);
   if (base::PathExists(current_session_path)) {
-    int64 file_size;
+    int64_t file_size;
     if (base::GetFileSize(current_session_path, &file_size)) {
       if (type_ == sessions::BaseSessionService::TAB_RESTORE) {
         UMA_HISTOGRAM_COUNTS("TabRestore.last_session_file_size",
                              static_cast<int>(file_size / 1024));
       } else {
         UMA_HISTOGRAM_COUNTS("SessionRestore.last_session_file_size",
                              static_cast<int>(file_size / 1024));
       }
     }
     last_session_valid_ = base::Move(current_session_path, last_session_path);
@@ skipping 110 matching lines @@
 base::FilePath SessionBackend::GetCurrentSessionPath() {
   base::FilePath path = path_to_dir_;
   if (type_ == sessions::BaseSessionService::TAB_RESTORE)
     path = path.AppendASCII(kCurrentTabSessionFileName);
   else
     path = path.AppendASCII(kCurrentSessionFileName);
   return path;
 }
 
 }  // namespace sessions