| 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 79a8ca9760528d1734ca578639c3291843ef15c6..6c4f953dcaae50a3e16e481ab20479159ad9cc53 100644
|
| --- a/ui/base/resource/resource_bundle_unittest.cc
|
| +++ b/ui/base/resource/resource_bundle_unittest.cc
|
| @@ -89,7 +89,7 @@ TEST(ResourceBundle, DelegateGetPathForResourcePack) {
|
| .Times(1)
|
| .WillOnce(Return(pack_path));
|
|
|
| - resource_bundle.AddDataPack(pack_path, pack_scale_factor);
|
| + resource_bundle.AddDataPackFromPath(pack_path, pack_scale_factor);
|
| }
|
|
|
| TEST(ResourceBundle, DelegateGetPathForLocalePack) {
|
| @@ -251,7 +251,7 @@ TEST(ResourceBundle, LoadDataResourceBytes) {
|
| kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
|
|
|
| // Give a .pak file that doesn't exist so we will fail to load it.
|
| - resource_bundle.AddDataPack(
|
| + resource_bundle.AddDataPackFromPath(
|
| FilePath(FILE_PATH_LITERAL("non-existant-file.pak")),
|
| ui::SCALE_FACTOR_NONE);
|
| EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
|
| @@ -281,7 +281,7 @@ TEST(ResourceBundle, GetRawDataResource) {
|
|
|
| // Load the regular and 2x pak files.
|
| resource_bundle.LoadTestResources(data_path, locale_path);
|
| - resource_bundle.AddDataPack(data_2x_path, SCALE_FACTOR_200P);
|
| + resource_bundle.AddDataPackFromPath(data_2x_path, SCALE_FACTOR_200P);
|
|
|
| // Resource ID 4 exists in both 1x and 2x paks, so we expect a different
|
| // result when requesting the 2x scale.
|
|
|