Index: ui/base/resource/resource_bundle_unittest.cc |
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc |
index 945a596e41fff41df98a9476491a8244de47dd20..520a4240f538db385cb71942fe3c18536320edbc 100644 |
--- a/ui/base/resource/resource_bundle_unittest.cc |
+++ b/ui/base/resource/resource_bundle_unittest.cc |
@@ -12,7 +12,7 @@ |
#include "base/memory/ref_counted_memory.h" |
#include "base/path_service.h" |
#include "base/strings/utf_string_conversions.h" |
-#include "net/base/big_endian.h" |
+#include "grit/ui_resources.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
@@ -21,8 +21,6 @@ |
#include "ui/gfx/codec/png_codec.h" |
#include "ui/gfx/image/image_skia.h" |
-#include "grit/ui_resources.h" |
- |
using ::testing::_; |
using ::testing::Between; |
using ::testing::Property; |
@@ -92,6 +90,11 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate { |
} |
}; |
+uint32_t ReadBigEndian32(const void* ptr) { |
+ const uint8_t* data = reinterpret_cast<const uint8_t*>(ptr); |
+ return (data[3] << 0) | (data[2] << 8) | (data[1] << 16) | (data[0] << 24); |
+} |
+ |
// Returns |bitmap_data| with |custom_chunk| inserted after the IHDR chunk. |
void AddCustomChunk(const base::StringPiece& custom_chunk, |
std::vector<unsigned char>* bitmap_data) { |
@@ -105,9 +108,7 @@ void AddCustomChunk(const base::StringPiece& custom_chunk, |
char ihdr_length_data[sizeof(uint32)]; |
for (size_t i = 0; i < sizeof(uint32); ++i) |
ihdr_length_data[i] = *(ihdr_start + i); |
- uint32 ihdr_chunk_length = 0; |
- net::ReadBigEndian(reinterpret_cast<char*>(ihdr_length_data), |
- &ihdr_chunk_length); |
+ uint32 ihdr_chunk_length = ReadBigEndian32(ihdr_length_data); |
EXPECT_TRUE(std::equal( |
ihdr_start + sizeof(uint32), |
ihdr_start + sizeof(uint32) + sizeof(kPngIHDRChunkType), |