| Index: webkit/tools/test_shell/image_decoder_unittest.cc
|
| diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc
|
| index b7594370d26008ea0b1ff502700774da612c4ad1..d3c2b7552b254bfff724dff6e6abc7b826336a26 100644
|
| --- a/webkit/tools/test_shell/image_decoder_unittest.cc
|
| +++ b/webkit/tools/test_shell/image_decoder_unittest.cc
|
| @@ -34,7 +34,7 @@ bool ShouldSkipFile(const FilePath& path,
|
| return (file_selection == TEST_SMALLER) == (image_size > threshold);
|
| }
|
|
|
| -} // anonymous namespace
|
| +} // namespace
|
|
|
| void ReadFileToVector(const FilePath& path, std::vector<char>* contents) {
|
| std::string raw_image_data;
|
| @@ -52,9 +52,9 @@ FilePath GetMD5SumPath(const FilePath& path) {
|
| #if defined(CALCULATE_MD5_SUMS)
|
| void SaveMD5Sum(const std::wstring& path, const WebKit::WebImage& web_image) {
|
| // Calculate MD5 sum.
|
| - MD5Digest digest;
|
| + base::MD5Digest digest;
|
| web_image.getSkBitmap().lockPixels();
|
| - MD5Sum(web_image.getSkBitmap().getPixels(),
|
| + base::MD5Sum(web_image.getSkBitmap().getPixels(),
|
| web_image.getSkBitmap().width() * web_image.getSkBitmap().height() *
|
| sizeof(uint32_t),
|
| &digest);
|
| @@ -79,10 +79,10 @@ void VerifyImage(const WebKit::WebImageDecoder& decoder,
|
| EXPECT_FALSE(decoder.isFailed());
|
|
|
| // Calculate MD5 sum.
|
| - MD5Digest actual_digest;
|
| + base::MD5Digest actual_digest;
|
| WebKit::WebImage web_image = decoder.getFrameAtIndex(frame_index);
|
| web_image.getSkBitmap().lockPixels();
|
| - MD5Sum(web_image.getSkBitmap().getPixels(),
|
| + base::MD5Sum(web_image.getSkBitmap().getPixels(),
|
| web_image.getSkBitmap().width() * web_image.getSkBitmap().height() *
|
| sizeof(uint32_t),
|
| &actual_digest);
|
| @@ -90,12 +90,13 @@ void VerifyImage(const WebKit::WebImageDecoder& decoder,
|
| // Read the MD5 sum off disk.
|
| std::string file_bytes;
|
| file_util::ReadFileToString(md5_sum_path, &file_bytes);
|
| - MD5Digest expected_digest;
|
| + base::MD5Digest expected_digest;
|
| ASSERT_EQ(sizeof expected_digest, file_bytes.size()) << path.value();
|
| memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest);
|
|
|
| // Verify that the sums are the same.
|
| - EXPECT_EQ(0, memcmp(&expected_digest, &actual_digest, sizeof(MD5Digest)))
|
| + EXPECT_EQ(0,
|
| + memcmp(&expected_digest, &actual_digest, sizeof(base::MD5Digest)))
|
| << path.value();
|
| web_image.getSkBitmap().unlockPixels();
|
| }
|
|
|