Index: chrome/utility/importer/nss_decryptor_system_nss.cc |
diff --git a/chrome/utility/importer/nss_decryptor_system_nss.cc b/chrome/utility/importer/nss_decryptor_system_nss.cc |
index c6b3cbc2efa26298c37ac1d10afd98a45a8330cf..9d5d2486fbc8ad1054602d1ebb7745e2dbe9b5f5 100644 |
--- a/chrome/utility/importer/nss_decryptor_system_nss.cc |
+++ b/chrome/utility/importer/nss_decryptor_system_nss.cc |
@@ -6,8 +6,9 @@ |
#include <pk11pub.h> |
#include <pk11sdr.h> |
+#include <stdint.h> |
+#include <string.h> |
-#include "base/basictypes.h" |
#include "base/files/file_path.h" |
#include "base/strings/stringprintf.h" |
#include "base/strings/sys_string_conversions.h" |
@@ -121,7 +122,7 @@ unpadBlock(SECItem *data, int blockSize, SECItem *result) |
if (padLength > blockSize) { rv = SECFailure; goto loser; } |
/* verify padding */ |
- for (i=data->len - padLength; static_cast<uint32>(i) < data->len; i++) { |
+ for (i = data->len - padLength; static_cast<uint32_t>(i) < data->len; i++) { |
if (data->data[i] != padLength) { |
rv = SECFailure; |
goto loser; |