summaryrefslogtreecommitdiff
path: root/chromium/ui/base/resource/resource_bundle_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-17 17:24:03 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-06-22 07:51:41 +0000
commit774f54339e5db91f785733232d3950366db65d07 (patch)
tree068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/ui/base/resource/resource_bundle_unittest.cc
parentf7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)
downloadqtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/base/resource/resource_bundle_unittest.cc')
-rw-r--r--chromium/ui/base/resource/resource_bundle_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/ui/base/resource/resource_bundle_unittest.cc b/chromium/ui/base/resource/resource_bundle_unittest.cc
index 0e85ad9611a..2c0143e9907 100644
--- a/chromium/ui/base/resource/resource_bundle_unittest.cc
+++ b/chromium/ui/base/resource/resource_bundle_unittest.cc
@@ -7,12 +7,12 @@
#include <stddef.h>
#include <stdint.h>
#include <string.h>
+
#include <string>
#include "base/base_paths.h"
#include "base/big_endian.h"
#include "base/check_op.h"
-#include "base/cxx17_backports.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
@@ -78,11 +78,11 @@ gfx::ImageSkia ParseLottieAsStillImageForTesting(
// Returns |bitmap_data| with |custom_chunk| inserted after the IHDR chunk.
void AddCustomChunk(const base::StringPiece& custom_chunk,
std::vector<unsigned char>* bitmap_data) {
- EXPECT_LT(base::size(kPngMagic) + kPngChunkMetadataSize, bitmap_data->size());
+ EXPECT_LT(std::size(kPngMagic) + kPngChunkMetadataSize, bitmap_data->size());
EXPECT_TRUE(std::equal(bitmap_data->begin(),
- bitmap_data->begin() + base::size(kPngMagic),
+ bitmap_data->begin() + std::size(kPngMagic),
kPngMagic));
- auto ihdr_start = bitmap_data->begin() + base::size(kPngMagic);
+ auto ihdr_start = bitmap_data->begin() + std::size(kPngMagic);
uint8_t ihdr_length_data[sizeof(uint32_t)];
for (size_t i = 0; i < sizeof(uint32_t); ++i)
ihdr_length_data[i] = *(ihdr_start + i);
@@ -414,7 +414,7 @@ class ResourceBundleImageTest : public ResourceBundleTest {
// Returns the number of DataPacks managed by |resource_bundle|.
size_t NumDataPacksInResourceBundle(ResourceBundle* resource_bundle) {
DCHECK(resource_bundle);
- return resource_bundle->data_packs_.size();
+ return resource_bundle->resource_handles_.size();
}
private:
@@ -641,7 +641,7 @@ TEST_F(ResourceBundleImageTest, GetImageNamedFallback1x) {
CreateDataPackWithSingleBitmap(
data_2x_path, 10,
base::StringPiece(reinterpret_cast<const char*>(kPngScaleChunk),
- base::size(kPngScaleChunk)));
+ std::size(kPngScaleChunk)));
// Load the regular and 2x pak files.
ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();