| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index 54489c1c33fd922e0eef1999e57024528940ca91..d20272910ca6976261ea2b1038791a75c9dc82e5 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -215,7 +215,7 @@ void ResourceBundle::InitSharedInstanceWithPakFileRegion(
|
| NOTREACHED() << "failed to load pak file";
|
| return;
|
| }
|
| - g_shared_instance_->locale_resources_data_.reset(data_pack.release());
|
| + g_shared_instance_->locale_resources_data_ = std::move(data_pack);
|
| g_shared_instance_->InitDefaultFontList();
|
| }
|
|
|
| @@ -336,7 +336,7 @@ std::string ResourceBundle::LoadLocaleResources(
|
| return std::string();
|
| }
|
|
|
| - locale_resources_data_.reset(data_pack.release());
|
| + locale_resources_data_ = std::move(data_pack);
|
| return app_locale;
|
| }
|
| #endif // defined(OS_ANDROID)
|
| @@ -353,7 +353,7 @@ void ResourceBundle::LoadTestResources(const base::FilePath& path,
|
|
|
| data_pack.reset(new DataPack(ui::SCALE_FACTOR_NONE));
|
| if (!locale_path.empty() && data_pack->LoadFromPath(locale_path)) {
|
| - locale_resources_data_.reset(data_pack.release());
|
| + locale_resources_data_ = std::move(data_pack);
|
| } else {
|
| locale_resources_data_.reset(new DataPack(ui::SCALE_FACTOR_NONE));
|
| }
|
|
|