Index: sync/internal_api/public/base/ordinal_unittest.cc |
diff --git a/sync/internal_api/public/base/ordinal_unittest.cc b/sync/internal_api/public/base/ordinal_unittest.cc |
index 7401e836583f927edee4f0b907bcaa74319edeeb..f4296ccc0c2ec25771179f7e065f0c7e213424cd 100644 |
--- a/sync/internal_api/public/base/ordinal_unittest.cc |
+++ b/sync/internal_api/public/base/ordinal_unittest.cc |
@@ -2,9 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/basictypes.h" |
#include "sync/internal_api/public/base/ordinal.h" |
-#include "testing/gtest/include/gtest/gtest.h" |
+ |
+#include <stdint.h> |
#include <algorithm> |
#include <cctype> |
@@ -12,25 +12,27 @@ |
#include <string> |
#include <vector> |
+#include "testing/gtest/include/gtest/gtest.h" |
+ |
namespace syncer { |
namespace { |
struct TestOrdinalTraits { |
- static const uint8 kZeroDigit = '0'; |
- static const uint8 kMaxDigit = '3'; |
+ static const uint8_t kZeroDigit = '0'; |
+ static const uint8_t kMaxDigit = '3'; |
static const size_t kMinLength = 1; |
}; |
struct LongOrdinalTraits { |
- static const uint8 kZeroDigit = '0'; |
- static const uint8 kMaxDigit = '9'; |
+ static const uint8_t kZeroDigit = '0'; |
+ static const uint8_t kMaxDigit = '9'; |
static const size_t kMinLength = 5; |
}; |
struct LargeOrdinalTraits { |
- static const uint8 kZeroDigit = 0; |
- static const uint8 kMaxDigit = kuint8max; |
+ static const uint8_t kZeroDigit = 0; |
+ static const uint8_t kMaxDigit = UINT8_MAX; |
static const size_t kMinLength = 1; |
}; |