Switch to standard integer types in sync/.

sync/sessions/sync_session_context.h

 // 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.
 
 // SyncSessionContext encapsulates the contextual information and engine
 // components specific to a SyncSession.  Unlike the SyncSession, the context
 // can be reused across several sync cycles.
 //
 // The context does not take ownership of its pointer members.  It's up to
 // the surrounding classes to ensure those members remain valid while the
 // context is in use.
 //
 // It can only be used from the SyncerThread.
 
 #ifndef SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
 #define SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "sync/base/sync_export.h"
 #include "sync/engine/sync_engine_event_listener.h"
 #include "sync/sessions/debug_info_getter.h"
 #include "sync/sessions/model_type_registry.h"
 
 namespace syncer {
 
 class ExtensionsActivity;
 class ModelTypeRegistry;
 class ServerConnectionManager;
@@ skipping 51 matching lines @@
   // Account name, set once a directory has been opened.
   void set_account_name(const std::string& name) {
     DCHECK(account_name_.empty());
     account_name_ = name;
   }
   const std::string& account_name() const { return account_name_; }
 
   void set_max_commit_batch_size(int batch_size) {
     max_commit_batch_size_ = batch_size;
   }
-  int32 max_commit_batch_size() const { return max_commit_batch_size_; }
+  int32_t max_commit_batch_size() const { return max_commit_batch_size_; }
 
   base::ObserverList<SyncEngineEventListener>* listeners() {
     return &listeners_;
   }
 
   bool keystore_encryption_enabled() const {
     return keystore_encryption_enabled_;
   }
 
   void set_hierarchy_conflict_detected(bool value) {
@@ skipping 75 matching lines @@
   // enable the pre-commit update avoidance experiment described above.
   const bool client_enabled_pre_commit_update_avoidance_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_