Search engine updates #7494

bsclifton · 2020-12-22T22:45:47Z

Adds Ecosia to the following markets:
USA (US), UK (GB), France (FR), Germany (DE), Netherlands (NL), Belgium (BE), Switzerland (CH), Sweden (SE)

Fixes brave/brave-browser#13283

Submitter Checklist:

There is a ticket for my issue.
Used Github auto-closing keywords in the commit message.
Wrote a good PR/commit description
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).
Requested a security/privacy review as needed.

Reviewer Checklist:

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:

See brave/brave-browser#13283

bsclifton · 2020-12-22T22:59:25Z

@deeppandya anything needed on Android to add this new option to the list?

deeppandya · 2020-12-23T05:31:56Z

@deeppandya anything needed on Android to add this new option to the list?

@bsclifton we would need new icons for ecosia for search engine onboarding in android. @jamesmudgett or @karenkliu can you help with it ?

components/search_engines/brave_prepopulated_engines.cc

simonhong

++ Works great!

bsclifton · 2020-12-24T03:20:21Z

Pre-merge checklist:

need to update desktop w/ referral ID
need to update P3A to be able to track this (forgot)
Android implementation needs icon and work for onboarding screen
Android implementation needs to remove Yahoo

iefremov · 2021-01-04T10:02:55Z

browser/search_engines/search_engine_tracker.cc

  } else if (type == SEARCH_ENGINE_YANDEX) {
    answer = SearchEngineP3A::kYandex;
+  } else if (type == SEARCH_ENGINE_ECOSIA) {


~~I guess we should also bump the metric id version?~~
n/m, now I see it is done

iefremov · 2021-01-05T14:52:37Z

will need updating https://github.com/brave/brave-browser/wiki/P3A

bsclifton · 2021-01-07T08:55:40Z

@pes10k can you please check out the latest commit? If it looks good, maybe you can give me an approval 😄
8c1efaf

pes10k · 2021-01-07T16:43:38Z

components/brave_extension/extension/brave_extension/content_cosmetic.ts

@@ -553,7 +553,7 @@ const scheduleQueuePump = (hide1pContent: boolean, generichide: boolean) => {
  }, { timeout: maxTimeMSBeforeStart })
 }

-const vettedSearchEngines = ['duckduckgo', 'qwant', 'bing', 'startpage', 'yahoo', 'onesearch', 'google', 'yandex']
+const vettedSearchEngines = ['duckduckgo', 'qwant', 'bing', 'startpage', 'yahoo', 'onesearch', 'google', 'yandex', 'ecosia']


I think yahoo should be removed from here, right?

@SergeyZhukovsky , just a heads up to make sure the Android work you're doing stays in sync with the above changes

sounds good, I added ecosia as well

pes10k · 2021-01-07T16:44:16Z

@bsclifton just one small change requested, but otherwise the parts im familiar with look good to me!

Shown in the following markets: USA (US), UK (GB), France (FR), Germany (DE), Netherlands (NL), Belgium (BE), Switzerland (CH), Sweden (SE) Fixes brave/brave-browser#13283

Follow up to brave/brave-browser#10575

bsclifton · 2021-01-07T19:51:42Z

@pes10k updated 😄 Please see 2020a47

pes10k · 2021-01-07T22:51:27Z

@bsclifton looks great!

bsclifton · 2021-01-07T23:05:29Z

CI looks good and we have approvals 😄 We might have a follow up to this - but will create a separate issue/PR for that

kjozwiak · 2021-01-12T22:10:09Z

Verification PASSED on Win 10 x64 using the following build:

`Case 1` - Verify changes in the `Default search engines` list

`USA`	`USA`	`USA`	`USA`

`UK`	`UK`	`UK`	`UK`

`France`	`France`	`France` (Default Quant)	`France`

Note: ensured that Qwant was still the default search engine in France

`Germany`	`Germany`	`Germany` (Default DDG)	`Germany`

Note: ensured that DDG was still the default search engine in Germany

`Netherlands`	`Netherlands`	`Netherlands`	`Netherlands`

`Belgium`	`Belgium`	`Belgium`	`Belgium`

`Switzerland`	`Switzerland`	`Switzerland`	`Switzerland`

`Sweden`	`Sweden`	`Sweden`	`Sweden`

`Case 2` - Verify folks w/ Yahoo set don't lose their setting

Case 1 - Canada

downloaded 1.20.65 CR: 88.0.4324.51 and set the default SE as Startpage
upgraded to 1.20.73 CR: 88.0.4324.79 and ensured that Startpage was still set as the default SE
- checked both brave://settings/search & brave://settings/searchEngines
ensured that Ecosia wasn't being listed under brave://settings/search & brave://settings/searchEngines
ensured that Yahoo was removed from both brave://settings/search & brave://settings/searchEngines

Case 2 - USA

downloaded 1.20.65 CR: 88.0.4324.51 and set the default SE as Yahoo
upgraded to 1.20.73 CR: 88.0.4324.79 and ensured that Yahoo was still set as the default SE
- checked both brave://settings/search & brave://settings/searchEngines
ensured that Ecosia was being listed under brave://settings/search & brave://settings/searchEngines

Case 3 - France

downloaded 1.20.65 CR: 88.0.4324.51 and set the default SE as Qwant (Default)
upgraded to 1.20.73 CR: 88.0.4324.79 and ensured that Qwant was still set as the default SE
- checked both brave://settings/search & brave://settings/searchEngines
ensured that Ecosia was being listed under brave://settings/search & brave://settings/searchEngines
- ensured that Yahoo was removed from both brave://settings/search & brave://settings/searchEngines

`Case 3` - Verify the Ecosia referral IDs used are correct

Searched via the omnibox when Ecosia was set as the default search engine and ensured that tt=e8eb07a6 as per https://github.com/brave/internal/wiki/Search-engine-integrations

Ensured that directly going to Ecosia and initiating a search doesn't use the referral code as per the following:

kjozwiak · 2021-01-13T03:49:31Z

Verification PASSED on Samsung S10+ running Android 10 using the following build:

`Case 1` - Verify changes in the `Default search engines` list

`USA`	`USA`	`USA`	`USA`

`UK`	`UK`	`UK`	`UK`

`France`	`France` (Default Quant)	`France` (Default Quant)	`France`

Note: ensured that Qwant was still the default search engine in France

`Belgium`	`Belgium`	`Belgium`	`Belgium`

`Switzerland`	`Switzerland`	`Switzerland`	`Switzerland`

`Sweden`	`Sweden`	`Sweden`	`Sweden`

`Case 2` - Verify folks w/ Yahoo set don't lose their setting <--- FAILED

Case 1 - Canada

downloaded 1.20.65 CR: 88.0.4324.51 and set the following default SE's
- Standard Tab --> Startpage
- Incognito Tab --> Bing
upgraded to 1.20.74 CR: 88.0.4324.79 and ensured that both Startpage & Bing were still set as the default SE
ensured that Ecosia wasn't being listed under both Standard Tab & Incognito Tab
ensured that Yahoo was removed from both Standard Tab & Incognito Tab

Case 2 - USA

downloaded 1.20.65 CR: 88.0.4324.51 and set the following default SE's
- Standard Tab --> Yahoo
- Incognito Tab --> Yahoo
upgraded to 1.20.74 CR: 88.0.4324.79 and ensured that both Yahoo was set as the default SE
ensured that Ecosia was being listed under both Standard Tab & Incognito Tab
ensured that Yahoo was removed from both Standard Tab & Incognito Tab

Case 3 - France

downloaded 1.20.65 CR: 88.0.4324.51 and set the following default SE's
- Standard Tab --> Qwant
- Incognito Tab --> Qwant
upgraded to 1.20.74 CR: 88.0.4324.79 and ensured that both Qwant was set as the default SE
ensured that Ecosia was being listed under both Standard Tab & Incognito Tab
ensured that Yahoo was removed from both Standard Tab & Incognito Tab

`Case 3` - Verify the Ecosia referral IDs used are correct

Searched via the omnibox when Ecosia was set as the default search engine and ensured that tt=42b8ae98 as per https://github.com/brave/internal/wiki/Search-engine-integrations

https://www.ecosia.org/search?tt=42b8ae98&q={brave+browser}
https://www.ecosia.org/search?tt=42b8ae98&q={bat+token}

Ensured that directly going to Ecosia and initiating a search doesn't use the referral code as per the following:

kjozwiak · 2021-01-13T03:50:38Z

@bsclifton heads up re: Germany. The onboarding modal doesn't appear on Android due to brave/brave-browser#11079. Believe a decision was made to leave it in that state as it would be difficult to change due to DDG being default in Germany. CCing @aekeus.

Also found brave/brave-browser#13531 while going through verifications.

bsclifton requested review from petemill, deeppandya, simonhong and mkarolin December 22, 2020 22:45

bsclifton requested a review from a team as a code owner December 22, 2020 22:45

bsclifton self-assigned this Dec 22, 2020

diracdeltas reviewed Dec 23, 2020

View reviewed changes

components/search_engines/brave_prepopulated_engines.cc Show resolved Hide resolved

simonhong approved these changes Dec 24, 2020

View reviewed changes

bsclifton changed the title ~~Add Ecosia as a default search alternative~~ Search engine updates Dec 28, 2020

bsclifton force-pushed the bsc-ecosia branch from 00ca083 to 5267322 Compare December 28, 2020 07:50

bsclifton requested a review from iefremov as a code owner December 28, 2020 07:50

iefremov reviewed Jan 4, 2021

View reviewed changes

iefremov approved these changes Jan 5, 2021

View reviewed changes

deeppandya force-pushed the bsc-ecosia branch from 2782ecb to e077e18 Compare January 5, 2021 18:45

bsclifton force-pushed the bsc-ecosia branch 2 times, most recently from f355224 to 8c1efaf Compare January 7, 2021 08:54

bsclifton requested a review from pes10k January 7, 2021 08:55

pes10k reviewed Jan 7, 2021

View reviewed changes

bsclifton and others added 6 commits January 7, 2021 11:04

Add Ecosia as a default search alternative

63afefd

Shown in the following markets: USA (US), UK (GB), France (FR), Germany (DE), Netherlands (NL), Belgium (BE), Switzerland (CH), Sweden (SE) Fixes brave/brave-browser#13283

Update P3A question results

ffce483

Remove Yahoo as a default search alternative

29bc625

Remove yahoo from SE onboarding android

4f0cb07

Add ecosia for android

3025c01

Add ecosia to list of vetted engines

2020a47

Follow up to brave/brave-browser#10575

bsclifton force-pushed the bsc-ecosia branch from 8c1efaf to 2020a47 Compare January 7, 2021 18:04

bsclifton merged commit 8158d17 into master Jan 7, 2021

bsclifton deleted the bsc-ecosia branch January 7, 2021 23:06

bsclifton added this to the 1.20.x - Nightly milestone Jan 7, 2021

bsclifton mentioned this pull request Jan 11, 2021

Search engine updates (Uplift to 1.19.x) #7564

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Search engine updates #7494

Search engine updates #7494

bsclifton commented Dec 22, 2020 •

edited

Loading

bsclifton commented Dec 22, 2020

deeppandya commented Dec 23, 2020

simonhong left a comment

bsclifton commented Dec 24, 2020 •

edited

Loading

iefremov Jan 4, 2021 •

edited

Loading

iefremov commented Jan 5, 2021

bsclifton commented Jan 7, 2021

pes10k Jan 7, 2021

SergeyZhukovsky Jan 7, 2021

pes10k commented Jan 7, 2021

bsclifton commented Jan 7, 2021

pes10k commented Jan 7, 2021

bsclifton commented Jan 7, 2021

kjozwiak commented Jan 12, 2021 •

edited

Loading

kjozwiak commented Jan 13, 2021 •

edited

Loading

kjozwiak commented Jan 13, 2021 •

edited

Loading

Search engine updates #7494

Search engine updates #7494

Conversation

bsclifton commented Dec 22, 2020 • edited Loading

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

bsclifton commented Dec 22, 2020

deeppandya commented Dec 23, 2020

simonhong left a comment

Choose a reason for hiding this comment

bsclifton commented Dec 24, 2020 • edited Loading

iefremov Jan 4, 2021 • edited Loading

Choose a reason for hiding this comment

iefremov commented Jan 5, 2021

bsclifton commented Jan 7, 2021

pes10k Jan 7, 2021

Choose a reason for hiding this comment

SergeyZhukovsky Jan 7, 2021

Choose a reason for hiding this comment

pes10k commented Jan 7, 2021

bsclifton commented Jan 7, 2021

pes10k commented Jan 7, 2021

bsclifton commented Jan 7, 2021

kjozwiak commented Jan 12, 2021 • edited Loading

Case 1 - Verify changes in the Default search engines list

Case 2 - Verify folks w/ Yahoo set don't lose their setting

Case 3 - Verify the Ecosia referral IDs used are correct

kjozwiak commented Jan 13, 2021 • edited Loading

Case 1 - Verify changes in the Default search engines list

Case 2 - Verify folks w/ Yahoo set don't lose their setting <--- FAILED

Case 3 - Verify the Ecosia referral IDs used are correct

kjozwiak commented Jan 13, 2021 • edited Loading

bsclifton commented Dec 22, 2020 •

edited

Loading

bsclifton commented Dec 24, 2020 •

edited

Loading

iefremov Jan 4, 2021 •

edited

Loading

kjozwiak commented Jan 12, 2021 •

edited

Loading

`Case 1` - Verify changes in the `Default search engines` list

`Case 2` - Verify folks w/ Yahoo set don't lose their setting

`Case 3` - Verify the Ecosia referral IDs used are correct

kjozwiak commented Jan 13, 2021 •

edited

Loading

`Case 1` - Verify changes in the `Default search engines` list

`Case 2` - Verify folks w/ Yahoo set don't lose their setting <--- FAILED

`Case 3` - Verify the Ecosia referral IDs used are correct

kjozwiak commented Jan 13, 2021 •

edited

Loading