diff options
| -rw-r--r-- | base/md5.h | 3 | ||||
| -rw-r--r-- | chrome/browser/chromeos/web_socket_proxy.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/web_applications/web_app.cc | 10 | ||||
| -rw-r--r-- | net/socket/web_socket_server_socket.cc | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/image_decoder_unittest.cc | 15 |
5 files changed, 16 insertions, 18 deletions
@@ -67,7 +67,4 @@ BASE_EXPORT std::string MD5String(const StringPiece& str); } // namespace base -// TODO(tfarina): Fix third_party/hunspell then remove this hack. -using base::MD5Digest; - #endif // BASE_MD5_H_ diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index b088b60..726c2f8 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -360,7 +360,7 @@ class Conn { std::map<std::string, std::string> header_fields_; // Cryptohashed answer for websocket handshake. - MD5Digest handshake_response_; + base::MD5Digest handshake_response_; // Hostname and port of destination socket. // Websocket client supplies them in first data frame (destframe). diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 65ffafe..09725de 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -100,7 +100,7 @@ bool IconPrecedes(const WebApplicationInfo::IconInfo& left, #if defined(OS_WIN) // Calculates image checksum using MD5. -void GetImageCheckSum(const SkBitmap& image, MD5Digest* digest) { +void GetImageCheckSum(const SkBitmap& image, base::MD5Digest* digest) { DCHECK(digest); SkAutoLockPixels image_lock(image); @@ -112,7 +112,7 @@ bool SaveIconWithCheckSum(const FilePath& icon_file, const SkBitmap& image) { if (!IconUtil::CreateIconFileFromSkBitmap(image, icon_file)) return false; - MD5Digest digest; + base::MD5Digest digest; GetImageCheckSum(image, &digest); FilePath cheksum_file(icon_file.ReplaceExtension(kIconChecksumFileExt)); @@ -130,18 +130,18 @@ bool ShouldUpdateIcon(const FilePath& icon_file, const SkBitmap& image) { !file_util::PathExists(checksum_file)) return true; - MD5Digest persisted_image_checksum; + base::MD5Digest persisted_image_checksum; if (sizeof(persisted_image_checksum) != file_util::ReadFile(checksum_file, reinterpret_cast<char*>(&persisted_image_checksum), sizeof(persisted_image_checksum))) return true; - MD5Digest downloaded_image_checksum; + base::MD5Digest downloaded_image_checksum; GetImageCheckSum(image, &downloaded_image_checksum); // Update icon if checksums are not equal. return memcmp(&persisted_image_checksum, &downloaded_image_checksum, - sizeof(MD5Digest)) != 0; + sizeof(base::MD5Digest)) != 0; } #endif // defined(OS_WIN) diff --git a/net/socket/web_socket_server_socket.cc b/net/socket/web_socket_server_socket.cc index a793097..7b17ae7 100644 --- a/net/socket/web_socket_server_socket.cc +++ b/net/socket/web_socket_server_socket.cc @@ -699,8 +699,8 @@ class WebSocketServerSocketImpl : public net::WebSocketServerSocket { memcpy(challenge, &part1, 4); memcpy(challenge + 4, &part2, 4); memcpy(challenge + 4 + 4, key3, sizeof(key3)); - MD5Digest challenge_response; - MD5Sum(challenge, sizeof(challenge), &challenge_response); + base::MD5Digest challenge_response; + base::MD5Sum(challenge, sizeof(challenge), &challenge_response); // Concocting response handshake. class Buffer { diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc index b759437..d3c2b75 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(); } |