remove Set default search engine screen for AT / ES / MX #14177

spylogsster · 2022-07-14T12:38:27Z

Resolves brave/brave-browser#23908
Resolves brave/brave-browser#23814

Submitter Checklist:

I confirm that no security/privacy review is needed, or that I have requested one
There is a ticket for my issue
Used Github auto-closing keywords in the PR description above
Wrote a good PR/commit description
Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
Ran git rebase master (if needed)

Reviewer Checklist:

A security review is not needed, or a link to one is included in the PR description
New files have MPL-2.0 license header
Adequate test coverage exists to prevent regressions
Major classes, functions and non-trivial code blocks are well-commented
Changes in component dependencies are properly reflected in gn
Code follows the style guide
Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

same as in issue

brave-builds · 2022-07-14T13:27:19Z

A Storybook has been deployed to preview UI for the latest push

bsclifton

Perfect! ++

brave-builds · 2022-07-14T21:27:55Z

A Storybook has been deployed to preview UI for the latest push

bsclifton

Can we also handle brave/brave-browser#23814 in here too?

Apologies for missing that 😢

brave-builds · 2022-07-15T11:04:59Z

A Storybook has been deployed to preview UI for the latest push

spylogsster · 2022-07-15T13:52:23Z

Can we also handle brave/brave-browser#23814 in here too?

Apologies for missing that 😢

done

brave-builds · 2022-07-17T04:53:27Z

A Storybook has been deployed to preview UI for the latest push

chromium_src/components/search_engines/template_url_prepopulate_data.cc

bsclifton

Perfect 😄👍

brave-builds · 2022-07-18T07:16:08Z

A Storybook has been deployed to preview UI for the latest push

spylogsster · 2022-07-18T10:30:29Z

@brave/chromium-src-reviewers can someone take a look pls? thanks!

brave-builds · 2022-07-18T15:59:27Z

A Storybook has been deployed to preview UI for the latest push

iefremov · 2022-07-19T13:31:17Z

chromium_src/components/search_engines/template_url_prepopulate_data.cc

-
-  if (version > 16) {
+  static const base::NoDestructor<
+      base::flat_map<int, BravePrepopulatedEngineID>>


could be constexpr fixed_flat_map?

it says that Non-constexpr constructor 'flat_tree' cannot be used in a constant expression

i mean, using base::MakeFixedFlatMap

done, thanks!

Nice! Didn't know about base::MakeFixedFlatMap 😄👍

brave-builds · 2022-07-19T17:49:28Z

A Storybook has been deployed to preview UI for the latest push

kjozwiak · 2022-07-26T06:03:45Z

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.43.42 Chromium: 103.0.5060.134 (Official Build) nightly (64-bit)
-- | --
Revision | 8ec6fce403b3feb0869b0732eda8bd95011d333c-refs/branch-heads/5060@{#1262}
OS | Windows 11 Version 21H2 (Build 22000.795)

`AT (Austria) locale`

`Case #1` - brave/brave-browser#23908

brave://welcome

Using the STR/Cases outlined via brave/brave-browser#23908 (comment) and ensured that the Set default search engine screen was removed from brave://welcome as per the following:

`Example`	`Example`	`Example`

`Case #2` - brave/brave-browser#23814

Clean Profile

ensured that Brave was selected as the default for both Normal/Private windows via brave://settings/searchEngines
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`Example`	`Example`	`Example`

Updated Profile (Google/Google)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Google was the default SE selected under brave://settings/searchEngines
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that Google is still the default SE
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`Example (Brave at top of list)`	`Example (Brave at top of list)`

Updated Profile (Startpage/DDG)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Startpage was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that DDG was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

Updated Profile (Ecosia/Qwant)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Ecosia was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Qwant was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`ES (Spain) locale`

`Case #1` - brave/brave-browser#23908

brave://welcome

Using the STR/Cases outlined via brave/brave-browser#23908 (comment) and ensured that the Set default search engine screen was removed from brave://welcome as per the following:

`Example`	`Example`	`Example`

`Case #2` - brave/brave-browser#23814

Clean Profile

ensured that Brave was selected as the default for both Normal/Private windows via brave://settings/searchEngines
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`Example`	`Example`	`Example`

Updated Profile (Google/Google)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Google was the default SE selected under brave://settings/searchEngines
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that Google is still the default SE
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`Example (Brave at top of list)`	`Example (Brave at top of list)`

Updated Profile (Bing/Brave)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Bing was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Brave was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

Updated Profile (DDG/DDG)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that DDG was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that DDG was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`MX (Mexico) locale`

`Case #1` - brave/brave-browser#23908

brave://welcome

Using the STR/Cases outlined via brave/brave-browser#23908 (comment) and ensured that the Set default search engine screen was removed from brave://welcome as per the following:

`Example`	`Example`	`Example`

`Case #2` - brave/brave-browser#23814

Clean Profile

ensured that Brave was selected as the default for both Normal/Private windows via brave://settings/searchEngines
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`Example`	`Example`	`Example`

Updated Profile (Google/Google)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Google was the default SE selected under brave://settings/searchEngines
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that Google is still the default SE
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`Example (Brave at top of list)`	`Example (Brave at top of list)`

Updated Profile (Qwant/Startpage)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Qwant was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Startpage was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

Updated Profile (Bing/Bing)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Bing was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Bing was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

As per brave/brave-browser#23908, ensured that locales from CA / DE / FR / GB / US are not displaying the Set default search engine screen via brave://welcome (onboarding).

`CA (Canada) locale`

`Case #1` - brave/brave-browser#23908

brave://welcome

Using the STR/Cases outlined via brave/brave-browser#23908 (comment) and ensured that the Set default search engine screen was removed from brave://welcome as per the following:

`Example`	`Example`	`Example`

`Case #2` - brave/brave-browser#23814

Clean Profile

ensured that Brave was selected as the default for both Normal/Private windows via brave://settings/searchEngines
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`Example`	`Example`	`Example`

Updated Profile (Brave/Brave)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Brave was the default SE selected under brave://settings/searchEngines
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that Brave is still the default SE
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`Example (Brave at top of list)`	`Example (Brave at top of list)`

Updated Profile (DDG/Startpage)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that DDG was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Startpage was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`FR (France) locale`

`Case #1` - brave/brave-browser#23908

brave://welcome

Using the STR/Cases outlined via brave/brave-browser#23908 (comment) and ensured that the Set default search engine screen was removed from brave://welcome as per the following:

`Example`	`Example`	`Example`

`Case #2` - brave/brave-browser#23814

Clean Profile

ensured that Brave was selected as the default for both Normal/Private windows via brave://settings/searchEngines
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`Example`	`Example`	`Example`

Updated Profile (Brave/Brave)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Brave was the default SE selected under brave://settings/searchEngines
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that Brave is still the default SE
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`Example (Brave at top of list)`	`Example (Brave at top of list)`

Updated Profile (Google/Ecosia)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that DDG was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Startpage was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

Checking to ensure that locales that don't have Brave Search as the default and still have the Set default search engine screen screen via brave://welcome (onboarding) are working as expected.

`JP (Japan) locale`

`Case #1` - brave/brave-browser#23908

brave://welcome

Using the STR/Cases outlined via brave/brave-browser#23908 (comment) and ensured that the Set default search engine screen was removed from brave://welcome as per the following:

`Example`	`Example`	`Example`	`Example`

`Case #2` - brave/brave-browser#23814

Clean Profile

ensured that Google was selected as the default for both Normal/Private windows via brave://settings/searchEngines
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`Example`	`Example`	`Example`

Updated Profile (Google/Google)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Google was the default SE selected under brave://settings/searchEngines
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that Brave is still the default SE
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

`Example (Brave at top of list)`	`Example (Brave at top of list)`

Updated Profile (Qwant/Bing)

installed 1.43.31 Chromium: 103.0.5060.114
ensured that Qwant was the default SE selected under brave://settings/searchEngines for Normal windows
ensured that Bing was the default SE selected under brave://settings/searchEngines for Private windows
updated to 1.43.42 Chromium: 103.0.5060.134 and ensured that both SE engines were still selected as the default
- ensured that it wasn't replaced by Brave
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Normal windows
ensured that Brave was the first engine via the drop down list under brave://settings/searchEngines for Private windows

`1.43.31 Chromium: 103.0.5060.114`	`1.43.42 Chromium: 103.0.5060.134`

spylogsster requested a review from bsclifton July 14, 2022 12:38

spylogsster self-assigned this Jul 14, 2022

github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jul 14, 2022

spylogsster added this to the 1.43.x - Nightly milestone Jul 14, 2022

spylogsster force-pushed the brave-23908 branch 2 times, most recently from 716505c to dd38ef0 Compare July 14, 2022 12:43

bsclifton approved these changes Jul 14, 2022

View reviewed changes

spylogsster force-pushed the brave-23908 branch from dd38ef0 to 716d711 Compare July 14, 2022 20:59

bsclifton requested changes Jul 14, 2022

View reviewed changes

spylogsster requested a review from a team as a code owner July 15, 2022 10:37

spylogsster force-pushed the brave-23908 branch from 3276e33 to eb23e8f Compare July 17, 2022 04:27

bsclifton reviewed Jul 18, 2022

View reviewed changes

chromium_src/components/search_engines/template_url_prepopulate_data.cc Show resolved Hide resolved

bsclifton approved these changes Jul 18, 2022

View reviewed changes

spylogsster force-pushed the brave-23908 branch from ba3e723 to 1730cef Compare July 18, 2022 15:24

iefremov reviewed Jul 19, 2022

View reviewed changes

iefremov approved these changes Jul 19, 2022

View reviewed changes

spylogsster force-pushed the brave-23908 branch from c780a54 to 75b0fb1 Compare July 19, 2022 16:41

spylogsster added 4 commits July 19, 2022 19:49

remove Set default search engine screen for AT / ES / MX

b641bb7

Added Brave search as default for AT/ES/MX

4a3db9b

Using default list of search engines

26405f8

Using MakeFixedFlatMap

37a35fb

spylogsster force-pushed the brave-23908 branch from 75b0fb1 to 37a35fb Compare July 19, 2022 16:49

spylogsster merged commit 72dcf21 into master Jul 19, 2022

spylogsster deleted the brave-23908 branch July 19, 2022 20:36

spylogsster restored the brave-23908 branch July 20, 2022 16:00

brave-builds pushed a commit that referenced this pull request Jul 20, 2022

Uplift of #14177 (squashed) to beta

0e000ef

brave-builds mentioned this pull request Jul 20, 2022

remove Set default search engine screen for AT / ES / MX (uplift to 1.42.x) #14260

Merged

7 tasks

This was referenced Jul 26, 2022

remove Set default search engine screen for AT / ES / MX brave/brave-browser#23908

Closed

Update search engine defaults for AT / ES / MX brave/brave-browser#23814

Closed

spylogsster deleted the brave-23908 branch November 1, 2022 10:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove Set default search engine screen for AT / ES / MX #14177

remove Set default search engine screen for AT / ES / MX #14177

spylogsster commented Jul 14, 2022 •

edited

Loading

brave-builds commented Jul 14, 2022

bsclifton left a comment

brave-builds commented Jul 14, 2022

bsclifton left a comment

brave-builds commented Jul 15, 2022

spylogsster commented Jul 15, 2022

brave-builds commented Jul 17, 2022

bsclifton left a comment

brave-builds commented Jul 18, 2022

spylogsster commented Jul 18, 2022

brave-builds commented Jul 18, 2022

iefremov Jul 19, 2022

spylogsster Jul 19, 2022

iefremov Jul 19, 2022

spylogsster Jul 19, 2022

bsclifton Jul 19, 2022

brave-builds commented Jul 19, 2022

kjozwiak commented Jul 26, 2022 •

edited

Loading

remove Set default search engine screen for AT / ES / MX #14177

remove Set default search engine screen for AT / ES / MX #14177

Conversation

spylogsster commented Jul 14, 2022 • edited Loading

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

brave-builds commented Jul 14, 2022

bsclifton left a comment

Choose a reason for hiding this comment

brave-builds commented Jul 14, 2022

bsclifton left a comment

Choose a reason for hiding this comment

brave-builds commented Jul 15, 2022

spylogsster commented Jul 15, 2022

brave-builds commented Jul 17, 2022

bsclifton left a comment

Choose a reason for hiding this comment

brave-builds commented Jul 18, 2022

spylogsster commented Jul 18, 2022

brave-builds commented Jul 18, 2022

iefremov Jul 19, 2022

Choose a reason for hiding this comment

spylogsster Jul 19, 2022

Choose a reason for hiding this comment

iefremov Jul 19, 2022

Choose a reason for hiding this comment

spylogsster Jul 19, 2022

Choose a reason for hiding this comment

bsclifton Jul 19, 2022

Choose a reason for hiding this comment

brave-builds commented Jul 19, 2022

kjozwiak commented Jul 26, 2022 • edited Loading

AT (Austria) locale

Case #1 - brave/brave-browser#23908

Case #2 - brave/brave-browser#23814

ES (Spain) locale

Case #1 - brave/brave-browser#23908

Case #2 - brave/brave-browser#23814

MX (Mexico) locale

Case #1 - brave/brave-browser#23908

Case #2 - brave/brave-browser#23814

CA (Canada) locale

Case #1 - brave/brave-browser#23908

Case #2 - brave/brave-browser#23814

FR (France) locale

Case #1 - brave/brave-browser#23908

Case #2 - brave/brave-browser#23814

JP (Japan) locale

Case #1 - brave/brave-browser#23908

Case #2 - brave/brave-browser#23814

spylogsster commented Jul 14, 2022 •

edited

Loading

kjozwiak commented Jul 26, 2022 •

edited

Loading

`AT (Austria) locale`

`Case #1` - brave/brave-browser#23908

`Case #2` - brave/brave-browser#23814

`ES (Spain) locale`

`Case #1` - brave/brave-browser#23908

`Case #2` - brave/brave-browser#23814

`MX (Mexico) locale`

`Case #1` - brave/brave-browser#23908

`Case #2` - brave/brave-browser#23814

`CA (Canada) locale`

`Case #1` - brave/brave-browser#23908

`Case #2` - brave/brave-browser#23814

`FR (France) locale`

`Case #1` - brave/brave-browser#23908

`Case #2` - brave/brave-browser#23814

`JP (Japan) locale`

`Case #1` - brave/brave-browser#23908

`Case #2` - brave/brave-browser#23814