Switch to standard integer types in crypto/.

crypto/encryptor.h

Index: crypto/encryptor.h
diff --git a/crypto/encryptor.h b/crypto/encryptor.h
index 85ebaeb14993d9ab86eb01f619b4a43843db17dd..e07eb3233b31df76c0d47540f161acc4f72896b8 100644
--- a/crypto/encryptor.h
+++ b/crypto/encryptor.h
@@ -5,9 +5,11 @@
 #ifndef CRYPTO_ENCRYPTOR_H_
 #define CRYPTO_ENCRYPTOR_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
@@ -47,8 +49,8 @@ class CRYPTO_EXPORT Encryptor {
 
    private:
     union {
-      uint32 components32[4];
-      uint64 components64[2];
+      uint32_t components32[4];
+      uint64_t components64[2];
     } counter_;
   };
 
@@ -99,7 +101,7 @@ class CRYPTO_EXPORT Encryptor {
   //
   // Returns false if this call failed.
   bool GenerateCounterMask(size_t plaintext_len,
-                           uint8* mask,
+                           uint8_t* mask,
                            size_t* mask_len);
 
   // Mask the |plaintext| message using |mask|. The output will be written to