1580201 - Expose ContentBlockingLog to GV

Status: RESOLVED FIXED

(GeckoView :: General, enhancement, P1)

Description

[Dylan Roeh (:droeh) (he/him)]

Per Ehsan's recommendation, exposing the ContentBlockingLog would let us bring Fenix's tracking protection UI in line with desktop's more easily.

Comment 1

[Dylan Roeh (:droeh) (he/him)]

Attachment: Bug 1580201 - Expose ContentBlockingLog to GV. r=snorp!,ehsan!,#geckoview-reviewers!

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/7fa60ca9bdb5
Expose ContentBlockingLog to GV. r=geckoview-reviewers,snorp,Ehsan

Comment 3

[Andreea Pavel [:apavel]]

Backed out for eslint failure at GeckoViewContentBlocking.jsm

Push with failure: https://treeherder.mozilla.org/#/jobs?repo=autoland&selectedJob=266799404&resultStatus=testfailed%2Cbusted%2Cexception&revision=7fa60ca9bdb51a9cc93b9d84171026ab329fb574

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=266799404&repo=autoland&lineNumber=285

Backout: https://hg.mozilla.org/integration/autoland/rev/fb870f8c2eb458adb392c549f3bef422d483abf3

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/c5b479638ee6
Expose ContentBlockingLog to GV. r=geckoview-reviewers,snorp,Ehsan

Comment 5

[Dylan Roeh (:droeh) (he/him)]

(In reply to Andreea Pavel [:apavel] from comment #3)

Backed out for eslint failure at GeckoViewContentBlocking.jsm

Push with failure: https://treeherder.mozilla.org/#/jobs?repo=autoland&selectedJob=266799404&resultStatus=testfailed%2Cbusted%2Cexception&revision=7fa60ca9bdb51a9cc93b9d84171026ab329fb574

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=266799404&repo=autoland&lineNumber=285

Backout: https://hg.mozilla.org/integration/autoland/rev/fb870f8c2eb458adb392c549f3bef422d483abf3

Should be good now.

Comment 6

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/c5b479638ee6

Comment 7

[Dylan Roeh (:droeh) (he/him)]

Comment on attachment 9091743 [details]
Bug 1580201 - Expose ContentBlockingLog to GV. r=snorp!,ehsan!,#geckoview-reviewers!

Beta/Release Uplift Approval Request

• User impact if declined: Fenix will have a harder time matching desktop UI for tracking protection
• Is this code covered by automated tests?: Yes
• Has the fix been verified in Nightly?: No
• Needs manual test from QE?: No
• If yes, steps to reproduce:
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Only adds new functionality to GV; any breakage can be avoided by falling back to previous API.
• String changes made/needed:

Comment 8

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9091743 [details]
Bug 1580201 - Expose ContentBlockingLog to GV. r=snorp!,ehsan!,#geckoview-reviewers!

Allows for better Fenix Tracking Protection. Approved for GV70.

Comment 9

[Noemi Erli[:noemi_erli]]

While trying to uplift this, received the following:

1. file 'mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt' was deleted in local [local] but was modified in other [graft].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
2. warning: conflicts while merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue

Comment 10

[Dylan Roeh (:droeh) (he/him)]

(In reply to Noemi Erli[:noemi_erli] from comment #9)

While trying to uplift this, received the following:

1. file 'mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt' was deleted in local [local] but was modified in other [graft].
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
2. warning: conflicts while merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue

I'll handle the uplift myself.

Comment 11

[Andreea Pavel [:apavel]]

https://hg.mozilla.org/releases/mozilla-beta/rev/245803e1ceed

Comment 12

[Alexandru Michis [:malexandru]]

Backed out changeset 245803e1ceed for missing part of the code.
There seem to be differences between the code that landed on central and beta.

Comment 13

[Dylan Roeh (:droeh) (he/him)]

https://hg.mozilla.org/releases/mozilla-beta/rev/21feee30ec61