| Index: components/compression/compression_utils_unittest.cc
|
| diff --git a/components/compression/compression_utils_unittest.cc b/components/compression/compression_utils_unittest.cc
|
| index 793a706eb2abe761010b4948058c7c4134ed5ace..84394b753537805ee26b4dda0aa5324802d221ad 100644
|
| --- a/components/compression/compression_utils_unittest.cc
|
| +++ b/components/compression/compression_utils_unittest.cc
|
| @@ -4,10 +4,13 @@
|
|
|
| #include "components/compression/compression_utils.h"
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace compression {
|
| @@ -16,19 +19,17 @@ namespace {
|
|
|
| // The data to be compressed by gzip. This is the hex representation of "hello
|
| // world".
|
| -const uint8 kData[] =
|
| - {0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
|
| - 0x72, 0x6c, 0x64};
|
| +const uint8_t kData[] = {0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20,
|
| + 0x77, 0x6f, 0x72, 0x6c, 0x64};
|
|
|
| // This is the string representation of gzip compressed string above. It was
|
| // obtained by running echo -n "hello world" | gzip -c | hexdump -e '8 1 ",
|
| // 0x%x"' followed by 0'ing out the OS byte (10th byte) in the header. This is
|
| // so that the test passes on all platforms (that run various OS'es).
|
| -const uint8 kCompressedData[] =
|
| - {0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
| - 0x00, 0xcb, 0x48, 0xcd, 0xc9, 0xc9, 0x57, 0x28, 0xcf,
|
| - 0x2f, 0xca, 0x49, 0x01, 0x00, 0x85, 0x11, 0x4a, 0x0d,
|
| - 0x0b, 0x00, 0x00, 0x00};
|
| +const uint8_t kCompressedData[] = {
|
| + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcb,
|
| + 0x48, 0xcd, 0xc9, 0xc9, 0x57, 0x28, 0xcf, 0x2f, 0xca, 0x49, 0x01,
|
| + 0x00, 0x85, 0x11, 0x4a, 0x0d, 0x0b, 0x00, 0x00, 0x00};
|
|
|
| } // namespace
|
|
|
|
|