Uplift to 0.72.x: Rewards button icon pre-opt-in gets correct scaling (#3830)

[petemill]

Rewards button icon pre-opt-in gets correct scaling

Original #3830

Sets the scale of the image compared to the size we want to display it, so that the underlying Draw function can work out if the image needs to be re-sized or not. Previously this was only happening (coincidentally) when the display was not using a scaling factor of 1 since this would not match the default scaling factor of the gfx::Image. Resize is done here: https://github.com/chromium/chromium/blob/0aa1854a269704ce0dd45641cfb9d440666e54bc/chrome/browser/ui/extensions/icon_with_badge_image_source.cc#L147-L148

Fix: brave/brave-browser#6663

This should be uplifted to wherever #3698 is uplifted to (currently 0.71.x).

[kjozwiak]

Restarting as this didn't start correctly and timed out after ~6mins.

[petemill]

CI still failed almost immediately. Investigating...

[kjozwiak]

Restarting both iOS & macOS due to the following failures:

• iOS --> https://ci.brave.com/job/brave-browser-build-pr/job/fix-6663-bat-icon-scale-72/3/execution/node/200/log/

14:25:53  [1:02:34] Still working on:
14:25:53  [1:02:34]   src/third_party/angle
14:25:53  [1:02:34]   src/third_party/pdfium
14:25:53  [1:02:34]   src/third_party/perfetto
14:25:53  [1:02:34]   src/third_party/skia
14:25:53  [1:02:34]   src/third_party/webrtc
14:25:53  [1:02:34]   src/v8
19:09:27  Sending interrupt signal to process
19:09:27  Sending interrupt signal to process
19:09:33  script returned exit code 143

• macOS --> https://ci.brave.com/job/brave-browser-build-pr/job/fix-6663-bat-icon-scale-72/3/execution/node/428/log/

17:19:44  ../../brave/browser/widevine/widevine_permission_request.cc:10:10: fatal error: 'chrome/app/vector_icons/vector_icons.h' file not found
17:19:44  #include "chrome/app/vector_icons/vector_icons.h"
17:19:44           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17:19:44  1 error generated.
17:19:45  [33547/38636] CXX obj/brave/common/extensions/api/generated_api_types/brave_shields.o
17:19:45  [33548/38636] CXX obj/brave/common/extensions/api/generated_api_types/rewards_notifications.o
17:19:45  [33549/38636] CXX obj/brave/common/extensions/api/generated_api_types/brave_wallet.o
17:19:46  [33550/38636] CXX obj/brave/common/extensions/api/api_features/api_features.o
17:19:46  [33551/38636] CXX obj/brave/common/extensions/api/generated_api_types/brave_rewards.o
17:19:47  [33552/38636] CXX obj/brave/common/common/brave_content_client.o
17:19:47  [33553/38636] CXX obj/brave/common/extensions/api/manifest_features/manifest_features.o
17:19:47  [33554/38636] CXX obj/brave/common/extensions/api/generated_api_types/brave_sync.o
17:19:47  [33555/38636] CXX obj/brave/browser/importer/importer/brave_profile_writer.o
17:19:49  [33556/38636] CXX obj/brave/components/brave_ads/browser/browser/ads_tab_helper.o
17:19:50  [33557/38636] CXX obj/brave/components/brave_ads/browser/browser/ads_service_factory.o
17:19:52  [33558/38636] CXX obj/brave/browser/widevine/widevine/widevine_utils.o
17:19:56  [33559/38636] CXX obj/brave/components/brave_ads/browser/browser/ads_service_impl.o
17:19:56  ninja: build stopped: subcommand failed.
17:19:56  null
17:19:56  null
17:19:56  npm ERR! code ELIFECYCLE

[kjozwiak]

Giving it one more go on macOS. Looks like the following checks failed:

• https://ci.brave.com/job/brave-browser-build-pr/job/fix-6663-bat-icon-scale-72/4/execution/node/456/log/
• https://ci.brave.com/job/brave-browser-build-pr/job/fix-6663-bat-icon-scale-72/4/execution/node/473/log/
• https://ci.brave.com/job/brave-browser-build-pr/job/fix-6663-bat-icon-scale-72/4/execution/node/486/log/

[kjozwiak]

Uplift into 0.72.x approved after deliberating with @brave/uplift-approvers. Both CI/Jenkins and CI/Travis passed without any issues.

Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.