Switch to standard integer types in sync/.

sync/util/nigori.cc

 // Copyright (c) 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 "sync/util/nigori.h"
 
+#include <stdint.h>
+
 #include <sstream>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/sys_byteorder.h"
 #include "crypto/encryptor.h"
 #include "crypto/hmac.h"
 #include "crypto/random.h"
 #include "crypto/symmetric_key.h"
 
 using base::Base64Encode;
 using base::Base64Decode;
 using crypto::Encryptor;
 using crypto::HMAC;
 using crypto::SymmetricKey;
 
 namespace syncer {
 
 // NigoriStream simplifies the concatenation operation of the Nigori protocol.
 class NigoriStream {
  public:
   // Append the big-endian representation of the length of |value| with 32 bits,
   // followed by |value| itself to the stream.
   NigoriStream& operator<<(const std::string& value) {
-    uint32 size = base::HostToNet32(value.size());
+    uint32_t size = base::HostToNet32(value.size());
 
-    stream_.write(reinterpret_cast<char*>(&size), sizeof(uint32));
+    stream_.write(reinterpret_cast<char*>(&size), sizeof(uint32_t));
     stream_ << value;
     return *this;
   }
 
   // Append the big-endian representation of the length of |type| with 32 bits,
   // followed by the big-endian representation of the value of |type|, with 32
   // bits, to the stream.
   NigoriStream& operator<<(const Nigori::Type type) {
-    uint32 size = base::HostToNet32(sizeof(uint32));
-    stream_.write(reinterpret_cast<char*>(&size), sizeof(uint32));
-    uint32 value = base::HostToNet32(type);
-    stream_.write(reinterpret_cast<char*>(&value), sizeof(uint32));
+    uint32_t size = base::HostToNet32(sizeof(uint32_t));
+    stream_.write(reinterpret_cast<char*>(&size), sizeof(uint32_t));
+    uint32_t value = base::HostToNet32(type);
+    stream_.write(reinterpret_cast<char*>(&value), sizeof(uint32_t));
     return *this;
   }
 
   std::string str() {
     return stream_.str();
   }
 
  private:
   std::ostringstream stream_;
 };
@@ skipping 184 matching lines @@
   DCHECK(user_key);
   DCHECK(encryption_key);
   DCHECK(mac_key);
 
   return user_key_->GetRawKey(user_key) &&
       encryption_key_->GetRawKey(encryption_key) &&
       mac_key_->GetRawKey(mac_key);
 }
 
 }  // namespace syncer