NTP Sponsored Images: Fix crash when using component with no data #4442
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7f337ce to
32b653f
Compare
petemill
commented
Jan 28, 2020
| @@ -113,7 +116,8 @@ void ViewCounterService::RegisterPageView() { | |||
| } | |||
|
|
|||
| bool ViewCounterService::IsBrandedWallpaperActive() { | |||
| return (is_supported_locale_ && IsOptedIn() && current_wallpaper()); | |||
| return (is_supported_locale_ && IsOptedIn() && current_wallpaper() && | |||
| current_wallpaper()->IsValid()); | |||
There was a problem hiding this comment.
This line fixes the issue for this PR. The others all just support adding the test.
simonhong
reviewed
Jan 28, 2020
|
|
||
| NTPSponsoredImagesData* CreateGoodData() { | ||
| NTPSponsoredImagesData* data = new NTPSponsoredImagesData; | ||
| // static auto demo = std::make_unique<NTPSponsoredImagesData>(); |
There was a problem hiding this comment.
I think this make_unique will work.
| data->logo_alt_text = "Technikke: For music lovers."; | ||
| data->logo_company_name = "Technikke"; | ||
| data->logo_destination_url = "https://brave.com"; | ||
| // return demo.get(); |
| @@ -48,7 +49,8 @@ ViewCounterService::ViewCounterService( | |||
| is_supported_locale_(is_supported_locale) { | |||
| // If we have a wallpaper, store it as private var. | |||
| // Set demo wallpaper if a flag is set. | |||
| if (!base::FeatureList::IsEnabled(features::kBraveNTPBrandedWallpaperDemo)) { | |||
| if (!base::FeatureList::IsEnabled(features::kBraveNTPBrandedWallpaperDemo) && | |||
| service_) { | |||
There was a problem hiding this comment.
Why did you check |service_| is null?
I can't find anyplace that passing null service.
bridiver
reviewed
Jan 28, 2020
| registry->RegisterBooleanPref( | ||
| kNewTabPageShowBrandedBackgroundImage, true); | ||
| user_prefs::PrefRegistrySyncable* registry) { | ||
| RegisterSponsoredImagesProfilePrefs(registry); |
There was a problem hiding this comment.
can we use the common pattern of a static RegisterProfilePrefs method on the service?
bridiver
approved these changes
Jan 28, 2020
32b653f to
d5fdbfd
Compare
simonhong
reviewed
Jan 28, 2020
| @@ -71,9 +83,10 @@ ViewCounterService::~ViewCounterService() = default; | |||
| NTPSponsoredImagesData* ViewCounterService::current_wallpaper() { | |||
| if (base::FeatureList::IsEnabled(features::kBraveNTPBrandedWallpaperDemo)) { | |||
| return GetDemoWallpaper(); | |||
| } else { | |||
| } else if (service_) { | |||
There was a problem hiding this comment.
I think we can delete this also because |service_| is always non-null.
- Adds validity checker to wallpaper-is-active checker - Adds tests for this - Validity checker checks wallpapers _and_ logo destination url - Moves NTP sponsored images preferences to component so tests can use local component pref names
d5fdbfd to
0be529e
Compare
|
CI failed on iOS for some reason, during init? Going to restart CI only for that platform. Otherwise, ready to merge 😄👍 |
petemill
added a commit
that referenced
this pull request
Jan 29, 2020
NTP Sponsored Images: Fix crash when using component with no data
This was referenced Jan 29, 2020
Merged
Merged
petemill
added a commit
that referenced
this pull request
Jan 29, 2020
NTP Sponsored Images: Fix crash when using component with no data
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix brave/brave-browser#7928
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
On brave/brave-browser#7928
Reviewer Checklist:
After-merge Checklist:
changes has landed on.