Merge mozilla-central to inbound a=merge on a CLOSED TREE
authorCoroiu Cristina <ccoroiu@mozilla.com>
Fri, 26 Oct 2018 01:03:37 +0300
changeset 443043 d197f134bdc0578cf92ec223ec7e84d39d1e0175
parent 443000 1c5256abc5b81e0624a014ee92c2b9553b0d7530 (current diff)
parent 443042 1e44ac3b69a4ad8aed1e59a6e15b099acaf6179a (diff)
child 443044 b1cb5cc2e2d56593315da5be4be25d19e2617ce8
push id109284
push userccoroiu@mozilla.com
push dateThu, 25 Oct 2018 22:04:16 +0000
treeherdermozilla-inbound@d197f134bdc0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to inbound a=merge on a CLOSED TREE
browser/base/content/test/general/browser_getshortcutoruri.js
mobile/android/app/src/photon/java/org/mozilla/gecko/home/SearchEngineRow.java
mobile/android/app/src/photon/java/org/mozilla/gecko/home/SuggestionItem.java
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/BrowserToolbarTablet.java
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/BrowserToolbarTabletBase.java
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ForwardButton.java
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/TabCounter.java
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarRoundButton.java
mobile/android/app/src/photon/res/color/action_bar_menu_item_colors.xml
mobile/android/app/src/photon/res/color/page_action_fg.xml
mobile/android/app/src/photon/res/color/search_suggestion_text.xml
mobile/android/app/src/photon/res/color/tab_menu_strip_color.xml
mobile/android/app/src/photon/res/color/tab_new_tab_strip_colors.xml
mobile/android/app/src/photon/res/color/tab_strip_item_title.xml
mobile/android/app/src/photon/res/color/tabs_counter_fg.xml
mobile/android/app/src/photon/res/color/tabs_counter_text.xml
mobile/android/app/src/photon/res/color/two_line_page_row_title.xml
mobile/android/app/src/photon/res/color/two_line_page_row_url.xml
mobile/android/app/src/photon/res/color/url_bar_image_color.xml
mobile/android/app/src/photon/res/color/url_bar_title.xml
mobile/android/app/src/photon/res/color/url_bar_title_highlight.xml
mobile/android/app/src/photon/res/color/url_bar_title_hint.xml
mobile/android/app/src/photon/res/drawable-hdpi-v11/alert_camera.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/alert_download.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/alert_guest.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/alert_mic.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-hdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_add_search_engine.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_copy.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_cut.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_done.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_paste.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_search.png
mobile/android/app/src/photon/res/drawable-hdpi/ab_select_all.png
mobile/android/app/src/photon/res/drawable-hdpi/add_folder.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_download_animation_1.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_download_animation_2.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_download_animation_3.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_download_animation_4.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_download_animation_5.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_download_animation_6.png
mobile/android/app/src/photon/res/drawable-hdpi/alert_mic_camera.png
mobile/android/app/src/photon/res/drawable-hdpi/arrow.png
mobile/android/app/src/photon/res/drawable-hdpi/arrow_up.png
mobile/android/app/src/photon/res/drawable-hdpi/as_pin_with_background.png
mobile/android/app/src/photon/res/drawable-hdpi/casting.png
mobile/android/app/src/photon/res/drawable-hdpi/casting_active.png
mobile/android/app/src/photon/res/drawable-hdpi/cloud.png
mobile/android/app/src/photon/res/drawable-hdpi/device_desktop.png
mobile/android/app/src/photon/res/drawable-hdpi/device_mobile.png
mobile/android/app/src/photon/res/drawable-hdpi/favicon_globe.png
mobile/android/app/src/photon/res/drawable-hdpi/find_close.png
mobile/android/app/src/photon/res/drawable-hdpi/find_next.png
mobile/android/app/src/photon/res/drawable-hdpi/find_prev.png
mobile/android/app/src/photon/res/drawable-hdpi/firefox_settings_alert.png
mobile/android/app/src/photon/res/drawable-hdpi/folder_closed.png
mobile/android/app/src/photon/res/drawable-hdpi/globe_light.png
mobile/android/app/src/photon/res/drawable-hdpi/handle_end.png
mobile/android/app/src/photon/res/drawable-hdpi/handle_middle.png
mobile/android/app/src/photon/res/drawable-hdpi/handle_start.png
mobile/android/app/src/photon/res/drawable-hdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-hdpi/home_tab_menu_strip.9.png
mobile/android/app/src/photon/res/drawable-hdpi/homepage_banner_firstrun.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_action_settings.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_cancel_nm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_cancel_pm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_nm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_globe_pm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_lock.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_lock_disabled.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_lock_inactive.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_media_pause.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_media_play.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_menu_share.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_mic_nm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_mic_pm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_overflow_nm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_overflow_pm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_qrcode.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_readermode_nm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_readermode_on.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_readermode_pm.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_search_icon.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_shield_disabled.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_shield_enabled.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_status_logo.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_url_bar_tab.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_warning_major.png
mobile/android/app/src/photon/res/drawable-hdpi/ic_warning_minor.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_bookmarks_empty.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_key.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_most_recent_empty.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_openinapp.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_recent.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_remote_tabs_empty.png
mobile/android/app/src/photon/res/drawable-hdpi/icon_shareplane.png
mobile/android/app/src/photon/res/drawable-hdpi/img_check.png
mobile/android/app/src/photon/res/drawable-hdpi/location.png
mobile/android/app/src/photon/res/drawable-hdpi/media_bar_pause.png
mobile/android/app/src/photon/res/drawable-hdpi/media_bar_play.png
mobile/android/app/src/photon/res/drawable-hdpi/media_bar_stop.png
mobile/android/app/src/photon/res/drawable-hdpi/menu.png
mobile/android/app/src/photon/res/drawable-hdpi/menu_item_check.png
mobile/android/app/src/photon/res/drawable-hdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-hdpi/menu_item_uncheck.png
mobile/android/app/src/photon/res/drawable-hdpi/orange_check.png
mobile/android/app/src/photon/res/drawable-hdpi/overlay_bookmark_icon.png
mobile/android/app/src/photon/res/drawable-hdpi/overlay_bookmarked_already_icon.png
mobile/android/app/src/photon/res/drawable-hdpi/overlay_check.png
mobile/android/app/src/photon/res/drawable-hdpi/pause.png
mobile/android/app/src/photon/res/drawable-hdpi/phone.png
mobile/android/app/src/photon/res/drawable-hdpi/play.png
mobile/android/app/src/photon/res/drawable-hdpi/push_notification.png
mobile/android/app/src/photon/res/drawable-hdpi/reading_list_folder.png
mobile/android/app/src/photon/res/drawable-hdpi/search_icon_active.png
mobile/android/app/src/photon/res/drawable-hdpi/shareplane.png
mobile/android/app/src/photon/res/drawable-hdpi/status_icon_readercache.png
mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_amazon.png
mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_facebook.png
mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_twitter.png
mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_wikipedia.png
mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_youtube.png
mobile/android/app/src/photon/res/drawable-hdpi/switch_button_icon.png
mobile/android/app/src/photon/res/drawable-hdpi/sync_desktop.png
mobile/android/app/src/photon/res/drawable-hdpi/sync_desktop_inactive.png
mobile/android/app/src/photon/res/drawable-hdpi/sync_mobile.png
mobile/android/app/src/photon/res/drawable-hdpi/sync_mobile_inactive.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_audio_playing.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_close.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_close_active.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_background.9.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected.9.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_indicator_selected_focused.9.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_new.png
mobile/android/app/src/photon/res/drawable-hdpi/tab_preview_masq.png
mobile/android/app/src/photon/res/drawable-hdpi/tabs_normal.png
mobile/android/app/src/photon/res/drawable-hdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-hdpi/tabs_private.png
mobile/android/app/src/photon/res/drawable-hdpi/undo_button_icon.png
mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_default.9.png
mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_default_pb.9.png
mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_pressed.9.png
mobile/android/app/src/photon/res/drawable-hdpi/url_bar_entry_pressed_pb.9.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/toolbar_favicon_default.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_default.9.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png
mobile/android/app/src/photon/res/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png
mobile/android/app/src/photon/res/drawable-large-v11/url_bar_nav_button.xml
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/toolbar_favicon_default.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_default.9.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png
mobile/android/app/src/photon/res/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png
mobile/android/app/src/photon/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-large-xxxhdpi-v11/toolbar_favicon_default.png
mobile/android/app/src/photon/res/drawable-ldrtl-hdpi/arrow.png
mobile/android/app/src/photon/res/drawable-ldrtl-hdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-ldrtl-hdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-hdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-hdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-ldrtl-hdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-large-hdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-large-hdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-large-xhdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-large-xhdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-large-xxhdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-large-xxhdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-xhdpi/arrow.png
mobile/android/app/src/photon/res/drawable-ldrtl-xhdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-ldrtl-xhdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-xhdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-xhdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-ldrtl-xhdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxhdpi/arrow.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxhdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxhdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxhdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxhdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxhdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxxhdpi/arrow.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxxhdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxxhdpi/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxxhdpi/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxxhdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-ldrtl-xxxhdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/alert_camera.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/alert_download.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/alert_guest.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/alert_mic.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-xhdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_add_search_engine.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_copy.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_cut.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_done.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_paste.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_search.png
mobile/android/app/src/photon/res/drawable-xhdpi/ab_select_all.png
mobile/android/app/src/photon/res/drawable-xhdpi/add_folder.png
mobile/android/app/src/photon/res/drawable-xhdpi/add_to_homescreen.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_download_animation_1.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_download_animation_2.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_download_animation_3.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_download_animation_4.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_download_animation_5.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_download_animation_6.png
mobile/android/app/src/photon/res/drawable-xhdpi/alert_mic_camera.png
mobile/android/app/src/photon/res/drawable-xhdpi/arrow.png
mobile/android/app/src/photon/res/drawable-xhdpi/arrow_up.png
mobile/android/app/src/photon/res/drawable-xhdpi/as_pin_with_background.png
mobile/android/app/src/photon/res/drawable-xhdpi/casting.png
mobile/android/app/src/photon/res/drawable-xhdpi/casting_active.png
mobile/android/app/src/photon/res/drawable-xhdpi/cloud.png
mobile/android/app/src/photon/res/drawable-xhdpi/device_desktop.png
mobile/android/app/src/photon/res/drawable-xhdpi/device_mobile.png
mobile/android/app/src/photon/res/drawable-xhdpi/favicon_globe.png
mobile/android/app/src/photon/res/drawable-xhdpi/find_close.png
mobile/android/app/src/photon/res/drawable-xhdpi/find_next.png
mobile/android/app/src/photon/res/drawable-xhdpi/find_prev.png
mobile/android/app/src/photon/res/drawable-xhdpi/firefox_settings_alert.png
mobile/android/app/src/photon/res/drawable-xhdpi/folder_closed.png
mobile/android/app/src/photon/res/drawable-xhdpi/globe_light.png
mobile/android/app/src/photon/res/drawable-xhdpi/handle_end.png
mobile/android/app/src/photon/res/drawable-xhdpi/handle_middle.png
mobile/android/app/src/photon/res/drawable-xhdpi/handle_start.png
mobile/android/app/src/photon/res/drawable-xhdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-xhdpi/homepage_banner_firstrun.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_action_settings.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_cancel_nm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_cancel_pm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_nm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_globe_pm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_lock.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_lock_disabled.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_lock_inactive.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_media_pause.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_media_play.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_menu_share.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_mic_nm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_mic_pm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_overflow_nm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_overflow_pm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_qrcode.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_readermode_nm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_readermode_on.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_readermode_pm.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_search_icon.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_shield_disabled.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_shield_enabled.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_status_logo.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_url_bar_tab.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_warning_major.png
mobile/android/app/src/photon/res/drawable-xhdpi/ic_warning_minor.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_bookmarks_empty.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_key.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_most_recent_empty.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_openinapp.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_recent.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_remote_tabs_empty.png
mobile/android/app/src/photon/res/drawable-xhdpi/icon_shareplane.png
mobile/android/app/src/photon/res/drawable-xhdpi/img_check.png
mobile/android/app/src/photon/res/drawable-xhdpi/location.png
mobile/android/app/src/photon/res/drawable-xhdpi/media_bar_pause.png
mobile/android/app/src/photon/res/drawable-xhdpi/media_bar_play.png
mobile/android/app/src/photon/res/drawable-xhdpi/media_bar_stop.png
mobile/android/app/src/photon/res/drawable-xhdpi/menu.png
mobile/android/app/src/photon/res/drawable-xhdpi/menu_item_check.png
mobile/android/app/src/photon/res/drawable-xhdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-xhdpi/menu_item_uncheck.png
mobile/android/app/src/photon/res/drawable-xhdpi/orange_check.png
mobile/android/app/src/photon/res/drawable-xhdpi/overlay_bookmark_icon.png
mobile/android/app/src/photon/res/drawable-xhdpi/overlay_bookmarked_already_icon.png
mobile/android/app/src/photon/res/drawable-xhdpi/overlay_check.png
mobile/android/app/src/photon/res/drawable-xhdpi/pause.png
mobile/android/app/src/photon/res/drawable-xhdpi/phone.png
mobile/android/app/src/photon/res/drawable-xhdpi/play.png
mobile/android/app/src/photon/res/drawable-xhdpi/push_notification.png
mobile/android/app/src/photon/res/drawable-xhdpi/reading_list_folder.png
mobile/android/app/src/photon/res/drawable-xhdpi/search_icon_active.png
mobile/android/app/src/photon/res/drawable-xhdpi/shareplane.png
mobile/android/app/src/photon/res/drawable-xhdpi/status_icon_readercache.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_amazon.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_facebook.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_restricted_fxsupport.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_restricted_mozilla.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_twitter.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_webmaker.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_wikipedia.png
mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_youtube.png
mobile/android/app/src/photon/res/drawable-xhdpi/switch_button_icon.png
mobile/android/app/src/photon/res/drawable-xhdpi/sync_desktop.png
mobile/android/app/src/photon/res/drawable-xhdpi/sync_desktop_inactive.png
mobile/android/app/src/photon/res/drawable-xhdpi/sync_mobile.png
mobile/android/app/src/photon/res/drawable-xhdpi/sync_mobile_inactive.png
mobile/android/app/src/photon/res/drawable-xhdpi/tab_audio_playing.png
mobile/android/app/src/photon/res/drawable-xhdpi/tab_close.png
mobile/android/app/src/photon/res/drawable-xhdpi/tab_close_active.png
mobile/android/app/src/photon/res/drawable-xhdpi/tab_new.png
mobile/android/app/src/photon/res/drawable-xhdpi/tab_preview_masq.png
mobile/android/app/src/photon/res/drawable-xhdpi/tabs_normal.png
mobile/android/app/src/photon/res/drawable-xhdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-xhdpi/tabs_private.png
mobile/android/app/src/photon/res/drawable-xhdpi/undo_button_icon.png
mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_default.9.png
mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_default_pb.9.png
mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_pressed.9.png
mobile/android/app/src/photon/res/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/alert_camera.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/alert_download.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/alert_guest.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/alert_mic.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-xxhdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_add_search_engine.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_copy.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_cut.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_done.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_paste.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_search.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ab_select_all.png
mobile/android/app/src/photon/res/drawable-xxhdpi/add_folder.png
mobile/android/app/src/photon/res/drawable-xxhdpi/add_to_homescreen.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_download_animation_1.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_download_animation_2.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_download_animation_3.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_download_animation_4.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_download_animation_5.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_download_animation_6.png
mobile/android/app/src/photon/res/drawable-xxhdpi/alert_mic_camera.png
mobile/android/app/src/photon/res/drawable-xxhdpi/arrow.png
mobile/android/app/src/photon/res/drawable-xxhdpi/arrow_up.png
mobile/android/app/src/photon/res/drawable-xxhdpi/as_pin_with_background.png
mobile/android/app/src/photon/res/drawable-xxhdpi/casting.png
mobile/android/app/src/photon/res/drawable-xxhdpi/casting_active.png
mobile/android/app/src/photon/res/drawable-xxhdpi/cloud.png
mobile/android/app/src/photon/res/drawable-xxhdpi/device_desktop.png
mobile/android/app/src/photon/res/drawable-xxhdpi/device_mobile.png
mobile/android/app/src/photon/res/drawable-xxhdpi/favicon_globe.png
mobile/android/app/src/photon/res/drawable-xxhdpi/find_close.png
mobile/android/app/src/photon/res/drawable-xxhdpi/find_next.png
mobile/android/app/src/photon/res/drawable-xxhdpi/find_prev.png
mobile/android/app/src/photon/res/drawable-xxhdpi/firefox_settings_alert.png
mobile/android/app/src/photon/res/drawable-xxhdpi/folder_closed.png
mobile/android/app/src/photon/res/drawable-xxhdpi/globe_light.png
mobile/android/app/src/photon/res/drawable-xxhdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-xxhdpi/homepage_banner_firstrun.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_action_settings.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_cancel_nm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_cancel_pm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_nm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_globe_pm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_lock.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_lock_disabled.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_lock_inactive.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_media_pause.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_media_play.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_menu_share.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_mic_nm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_mic_pm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_overflow_nm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_overflow_pm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_qrcode.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_readermode_nm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_readermode_on.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_readermode_pm.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_search_icon.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_shield_disabled.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_shield_enabled.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_status_logo.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_url_bar_tab.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_warning_major.png
mobile/android/app/src/photon/res/drawable-xxhdpi/ic_warning_minor.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_bookmarks_empty.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_key.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_most_recent_empty.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_openinapp.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_recent.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_remote_tabs_empty.png
mobile/android/app/src/photon/res/drawable-xxhdpi/icon_shareplane.png
mobile/android/app/src/photon/res/drawable-xxhdpi/img_check.png
mobile/android/app/src/photon/res/drawable-xxhdpi/location.png
mobile/android/app/src/photon/res/drawable-xxhdpi/media_bar_pause.png
mobile/android/app/src/photon/res/drawable-xxhdpi/media_bar_play.png
mobile/android/app/src/photon/res/drawable-xxhdpi/media_bar_stop.png
mobile/android/app/src/photon/res/drawable-xxhdpi/menu.png
mobile/android/app/src/photon/res/drawable-xxhdpi/menu_item_check.png
mobile/android/app/src/photon/res/drawable-xxhdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-xxhdpi/menu_item_uncheck.png
mobile/android/app/src/photon/res/drawable-xxhdpi/orange_check.png
mobile/android/app/src/photon/res/drawable-xxhdpi/overlay_bookmark_icon.png
mobile/android/app/src/photon/res/drawable-xxhdpi/overlay_bookmarked_already_icon.png
mobile/android/app/src/photon/res/drawable-xxhdpi/overlay_check.png
mobile/android/app/src/photon/res/drawable-xxhdpi/pause.png
mobile/android/app/src/photon/res/drawable-xxhdpi/phone.png
mobile/android/app/src/photon/res/drawable-xxhdpi/play.png
mobile/android/app/src/photon/res/drawable-xxhdpi/push_notification.png
mobile/android/app/src/photon/res/drawable-xxhdpi/reading_list_folder.png
mobile/android/app/src/photon/res/drawable-xxhdpi/search_icon_active.png
mobile/android/app/src/photon/res/drawable-xxhdpi/shareplane.png
mobile/android/app/src/photon/res/drawable-xxhdpi/status_icon_readercache.png
mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_amazon.png
mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_facebook.png
mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_twitter.png
mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_wikipedia.png
mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_youtube.png
mobile/android/app/src/photon/res/drawable-xxhdpi/switch_button_icon.png
mobile/android/app/src/photon/res/drawable-xxhdpi/sync_desktop.png
mobile/android/app/src/photon/res/drawable-xxhdpi/sync_desktop_inactive.png
mobile/android/app/src/photon/res/drawable-xxhdpi/sync_mobile.png
mobile/android/app/src/photon/res/drawable-xxhdpi/sync_mobile_inactive.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tab_audio_playing.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tab_close_active.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tab_new.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tab_preview_masq.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tabs_normal.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-xxhdpi/tabs_private.png
mobile/android/app/src/photon/res/drawable-xxhdpi/undo_button_icon.png
mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_default.9.png
mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_default_pb.9.png
mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_pressed.9.png
mobile/android/app/src/photon/res/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/alert_camera.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/alert_download.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/alert_guest.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/alert_mic.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/ic_menu_back.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/ic_menu_bookmark_add.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/ic_menu_forward.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/ic_menu_reload.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/ic_menu_stop.png
mobile/android/app/src/photon/res/drawable-xxxhdpi-v11/star_blue.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_add_search_engine.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_copy.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_cut.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_done.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_paste.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_search.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ab_select_all.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/add_folder.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/add_to_homescreen.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_download_animation_1.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_download_animation_2.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_download_animation_3.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_download_animation_4.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_download_animation_5.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_download_animation_6.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/alert_mic_camera.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/arrow.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/arrow_up.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/casting.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/casting_active.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/cloud.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/device_desktop.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/device_mobile.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/favicon_globe.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/find_close.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/find_next.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/find_prev.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/firefox_settings_alert.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/folder_closed.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/globe_light.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/home_group_collapsed.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/homepage_banner_firstrun.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_action_settings.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_cancel_nm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_cancel_pm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_nm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_globe_pm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_lock.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_lock_disabled.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_lock_inactive.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_media_pause.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_media_play.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_menu_share.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_mic_nm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_mic_pm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_overflow_nm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_overflow_pm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_qrcode.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_readermode_nm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_readermode_on.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_readermode_pm.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_search_icon.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_shield_disabled.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_shield_enabled.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_status_logo.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_url_bar_tab.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_warning_major.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_warning_minor.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_bookmarks_empty.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_key.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_most_recent_empty.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_openinapp.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_recent.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_remote_tabs_empty.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/icon_shareplane.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/img_check.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/location.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/media_bar_pause.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/media_bar_play.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/media_bar_stop.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/menu.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/menu_item_check.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/menu_item_more.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/menu_item_uncheck.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/orange_check.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/overlay_bookmark_icon.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/overlay_bookmarked_already_icon.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/overlay_check.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/pause.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/phone.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/play.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/push_notification.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/reading_list_folder.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/search_icon_active.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/shareplane.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/status_icon_readercache.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/switch_button_icon.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/sync_desktop.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/sync_desktop_inactive.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/sync_mobile.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/sync_mobile_inactive.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tab_audio_playing.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tab_close.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tab_close_active.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tab_new.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tab_preview_masq.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tabs_normal.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tabs_panel_nav_back.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tabs_private.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/tip_addsearch.png
mobile/android/app/src/photon/res/drawable-xxxhdpi/undo_button_icon.png
mobile/android/app/src/photon/res/drawable/action_bar_button.xml
mobile/android/app/src/photon/res/drawable/add_to_homescreen.png
mobile/android/app/src/photon/res/drawable/ic_cancel.xml
mobile/android/app/src/photon/res/drawable/ic_mic.xml
mobile/android/app/src/photon/res/drawable/ic_overflow.xml
mobile/android/app/src/photon/res/drawable/ic_readermode.xml
mobile/android/app/src/photon/res/drawable/menu_item_button.xml
mobile/android/app/src/photon/res/drawable/pwa_oboarding.png
mobile/android/app/src/photon/res/drawable/search_list_bg.xml
mobile/android/app/src/photon/res/drawable/search_list_selector.xml
mobile/android/app/src/photon/res/drawable/search_list_selector_private.xml
mobile/android/app/src/photon/res/drawable/search_suggestion_button.xml
mobile/android/app/src/photon/res/drawable/search_suggestion_prompt_no.xml
mobile/android/app/src/photon/res/drawable/search_suggestion_prompt_yes.xml
mobile/android/app/src/photon/res/drawable/security_mode_icon.xml
mobile/android/app/src/photon/res/drawable/security_mode_icon_nm.xml
mobile/android/app/src/photon/res/drawable/security_mode_icon_pm.xml
mobile/android/app/src/photon/res/drawable/tab_strip_item_bg.xml
mobile/android/app/src/photon/res/drawable/tabs_counter_bar.xml
mobile/android/app/src/photon/res/drawable/tabs_counter_box.xml
mobile/android/app/src/photon/res/drawable/url_bar_action_button.xml
mobile/android/app/src/photon/res/drawable/url_bar_bg.xml
mobile/android/app/src/photon/res/drawable/url_bar_title_bg.xml
mobile/android/app/src/photon/res/layout-large-v11/browser_toolbar.xml
mobile/android/app/src/photon/res/layout/browser_search.xml
mobile/android/app/src/photon/res/layout/browser_toolbar.xml
mobile/android/app/src/photon/res/layout/home_item_row.xml
mobile/android/app/src/photon/res/layout/home_pager.xml
mobile/android/app/src/photon/res/layout/home_search_item_row.xml
mobile/android/app/src/photon/res/layout/home_smartfolder.xml
mobile/android/app/src/photon/res/layout/home_suggestion_prompt.xml
mobile/android/app/src/photon/res/layout/preference_search_tip.xml
mobile/android/app/src/photon/res/layout/private_tabs_panel.xml
mobile/android/app/src/photon/res/layout/search_engine_row.xml
mobile/android/app/src/photon/res/layout/suggestion_item.xml
mobile/android/app/src/photon/res/layout/tab_strip.xml
mobile/android/app/src/photon/res/layout/tab_strip_inner.xml
mobile/android/app/src/photon/res/layout/tab_strip_item.xml
mobile/android/app/src/photon/res/layout/tab_strip_item_view.xml
mobile/android/app/src/photon/res/layout/tabs_counter.xml
mobile/android/app/src/photon/res/layout/toolbar_display_layout.xml
mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
mobile/android/app/src/photon/res/layout/two_line_page_row.xml
mobile/android/app/src/photon/res/values-land/dimens.xml
mobile/android/app/src/photon/res/values-land/styles.xml
mobile/android/app/src/photon/res/values-large-land-v11/dimens.xml
mobile/android/app/src/photon/res/values-large-land-v11/styles.xml
mobile/android/app/src/photon/res/values-large-v16/dimens.xml
mobile/android/app/src/photon/res/values-large-v16/styles.xml
mobile/android/app/src/photon/res/values-large-v17/styles.xml
mobile/android/app/src/photon/res/values-large/dimens.xml
mobile/android/app/src/photon/res/values-large/styles.xml
mobile/android/app/src/photon/res/values-sw240dp/dimens.xml
mobile/android/app/src/photon/res/values-sw360dp/dimens.xml
mobile/android/app/src/photon/res/values-sw400dp/dimens.xml
mobile/android/app/src/photon/res/values-v11/dimens.xml
mobile/android/app/src/photon/res/values-v11/styles.xml
mobile/android/app/src/photon/res/values-v13/styles.xml
mobile/android/app/src/photon/res/values-v16/styles.xml
mobile/android/app/src/photon/res/values-v17/styles.xml
mobile/android/app/src/photon/res/values-v19/dimens.xml
mobile/android/app/src/photon/res/values-v19/styles.xml
mobile/android/app/src/photon/res/values-v21/dimens.xml
mobile/android/app/src/photon/res/values-v21/styles.xml
mobile/android/app/src/photon/res/values-w400dp/styles.xml
mobile/android/app/src/photon/res/values-xlarge-land-v11/styles.xml
mobile/android/app/src/photon/res/values-xlarge-v11/dimens.xml
mobile/android/app/src/photon/res/values-xlarge-v11/styles.xml
mobile/android/app/src/photon/res/values/colors.xml
mobile/android/app/src/photon/res/values/dimens.xml
mobile/android/app/src/photon/res/values/styles.xml
mobile/android/services/src/main/res/drawable-hdpi/sync_desktop.png
mobile/android/services/src/main/res/drawable-hdpi/sync_desktop_inactive.png
mobile/android/services/src/main/res/drawable-hdpi/sync_mobile.png
mobile/android/services/src/main/res/drawable-hdpi/sync_mobile_inactive.png
mobile/android/services/src/main/res/drawable-hdpi/sync_promo.png
mobile/android/services/src/main/res/drawable-xhdpi/sync_desktop.png
mobile/android/services/src/main/res/drawable-xhdpi/sync_desktop_inactive.png
mobile/android/services/src/main/res/drawable-xhdpi/sync_mobile.png
mobile/android/services/src/main/res/drawable-xhdpi/sync_mobile_inactive.png
mobile/android/services/src/main/res/drawable-xhdpi/sync_promo.png
mobile/android/services/src/main/res/drawable-xxhdpi/sync_desktop.png
mobile/android/services/src/main/res/drawable-xxhdpi/sync_desktop_inactive.png
mobile/android/services/src/main/res/drawable-xxhdpi/sync_mobile.png
mobile/android/services/src/main/res/drawable-xxhdpi/sync_mobile_inactive.png
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1545,21 +1545,18 @@ pref("browser.contentblocking.reportBrea
 #else
 pref("browser.contentblocking.reportBreakage.enabled", false);
 #endif
 // Show report breakage for tracking cookies in all channels.
 pref("browser.contentblocking.rejecttrackers.reportBreakage.enabled", true);
 
 pref("browser.contentblocking.reportBreakage.url", "https://tracking-protection-issues.herokuapp.com/new");
 
-// Content Blocking has a separate pref for the intro count, since the former TP intro
-// was updated when we introduced content blocking and we want people to see it again.
 pref("browser.contentblocking.introCount", 0);
 
-pref("privacy.trackingprotection.introCount", 0);
 pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
 
 // Always enable newtab segregation using containers
 pref("privacy.usercontext.about_newtab_segregation.enabled", true);
 // Enable Contextual Identity Containers
 #ifdef NIGHTLY_BUILD
 pref("privacy.userContext.enabled", true);
 pref("privacy.userContext.ui.enabled", true);
--- a/browser/base/content/browser-contentblocking.js
+++ b/browser/base/content/browser-contentblocking.js
@@ -33,42 +33,16 @@ var TrackingProtection = {
   enabledInPrivateWindows: false,
 
   get categoryItem() {
     delete this.categoryItem;
     return this.categoryItem =
       document.getElementById("identity-popup-content-blocking-category-tracking-protection");
   },
 
-  strings: {
-    get enableTooltip() {
-      delete this.enableTooltip;
-      return this.enableTooltip =
-        gNavigatorBundle.getString("trackingProtection.toggle.enable.tooltip");
-    },
-
-    get disableTooltip() {
-      delete this.disableTooltip;
-      return this.disableTooltip =
-        gNavigatorBundle.getString("trackingProtection.toggle.disable.tooltip");
-    },
-
-    get disableTooltipPB() {
-      delete this.disableTooltipPB;
-      return this.disableTooltipPB =
-        gNavigatorBundle.getString("trackingProtection.toggle.disable.pbmode.tooltip");
-    },
-
-    get enableTooltipPB() {
-      delete this.enableTooltipPB;
-      return this.enableTooltipPB =
-        gNavigatorBundle.getString("trackingProtection.toggle.enable.pbmode.tooltip");
-    },
-  },
-
   init() {
     this.updateEnabled();
 
     Services.prefs.addObserver(this.PREF_ENABLED_GLOBALLY, this);
     Services.prefs.addObserver(this.PREF_ENABLED_IN_PRIVATE_WINDOWS, this);
 
     XPCOMUtils.defineLazyPreferenceGetter(this, "visible", this.PREF_UI_ENABLED, false);
   },
@@ -83,46 +57,21 @@ var TrackingProtection = {
   },
 
   get enabled() {
     return this.enabledGlobally ||
            (this.enabledInPrivateWindows &&
             PrivateBrowsingUtils.isWindowPrivate(window));
   },
 
-  onGlobalToggleCommand() {
-    if (PrivateBrowsingUtils.isWindowPrivate(window)) {
-      Services.prefs.setBoolPref(this.PREF_ENABLED_IN_PRIVATE_WINDOWS, !this.enabledInPrivateWindows);
-    } else {
-      Services.prefs.setBoolPref(this.PREF_ENABLED_GLOBALLY, !this.enabledGlobally);
-    }
-  },
-
   updateEnabled() {
     this.enabledGlobally =
       Services.prefs.getBoolPref(this.PREF_ENABLED_GLOBALLY);
     this.enabledInPrivateWindows =
       Services.prefs.getBoolPref(this.PREF_ENABLED_IN_PRIVATE_WINDOWS);
-
-    if (!ContentBlocking.contentBlockingUIEnabled) {
-      ContentBlocking.updateEnabled();
-      let appMenuButton = ContentBlocking.appMenuButton;
-
-      if (PrivateBrowsingUtils.isWindowPrivate(window)) {
-        appMenuButton.setAttribute("tooltiptext", this.enabledInPrivateWindows ?
-          this.strings.disableTooltipPB : this.strings.enableTooltipPB);
-        appMenuButton.setAttribute("enabled", this.enabledInPrivateWindows);
-        appMenuButton.setAttribute("aria-pressed", this.enabledInPrivateWindows);
-      } else {
-        appMenuButton.setAttribute("tooltiptext", this.enabledGlobally ?
-          this.strings.disableTooltip : this.strings.enableTooltip);
-        appMenuButton.setAttribute("enabled", this.enabledGlobally);
-        appMenuButton.setAttribute("aria-pressed", this.enabledGlobally);
-      }
-    }
   },
 
   isBlockerActivated(state) {
     return state & Ci.nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT;
   },
 };
 
 var ThirdPartyCookies = {
@@ -197,30 +146,28 @@ var ThirdPartyCookies = {
   },
 };
 
 
 var ContentBlocking = {
   // If the user ignores the doorhanger, we stop showing it after some time.
   MAX_INTROS: 20,
   PREF_ENABLED: "browser.contentblocking.enabled",
-  PREF_UI_ENABLED: "browser.contentblocking.ui.enabled",
   PREF_ANIMATIONS_ENABLED: "toolkit.cosmeticAnimations.enabled",
   PREF_REPORT_BREAKAGE_ENABLED: "browser.contentblocking.reportBreakage.enabled",
   PREF_REPORT_BREAKAGE_URL: "browser.contentblocking.reportBreakage.url",
   PREF_INTRO_COUNT_CB: "browser.contentblocking.introCount",
-  PREF_INTRO_COUNT_TP: "privacy.trackingprotection.introCount",
   PREF_GLOBAL_TOGGLE: "browser.contentblocking.global-toggle.enabled",
   content: null,
   icon: null,
   activeTooltipText: null,
   disabledTooltipText: null,
 
   get prefIntroCount() {
-    return this.contentBlockingUIEnabled ? this.PREF_INTRO_COUNT_CB : this.PREF_INTRO_COUNT_TP;
+    return this.PREF_INTRO_COUNT_CB;
   },
 
   get appMenuLabel() {
     delete this.appMenuLabel;
     return this.appMenuLabel = document.getElementById("appMenu-tp-label");
   },
 
   get appMenuButton() {
@@ -326,21 +273,21 @@ var ContentBlocking = {
     this.updateAnimationsEnabled();
 
     Services.prefs.addObserver(this.PREF_ANIMATIONS_ENABLED, this.updateAnimationsEnabled);
 
     XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingEnabled", this.PREF_ENABLED, false,
       this.updateEnabled.bind(this));
     XPCOMUtils.defineLazyPreferenceGetter(this, "reportBreakageEnabled",
       this.PREF_REPORT_BREAKAGE_ENABLED, false);
-    XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingUIEnabled", this.PREF_UI_ENABLED, false,
-      this.updateUIEnabled.bind(this));
 
     this.updateEnabled();
-    this.updateUIEnabled();
+
+    this.appMenuLabel.setAttribute("label", this.strings.appMenuTitle);
+    this.appMenuLabel.setAttribute("tooltiptext", this.strings.appMenuTooltip);
 
     this.activeTooltipText =
       gNavigatorBundle.getString("trackingProtection.icon.activeTooltip");
     this.disabledTooltipText =
       gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip");
   },
 
   uninit() {
@@ -350,52 +297,35 @@ var ContentBlocking = {
       }
     }
 
     Services.prefs.removeObserver(this.PREF_ANIMATIONS_ENABLED, this.updateAnimationsEnabled);
     Services.prefs.removeObserver(this.PREF_GLOBAL_TOGGLE, this.updateGlobalToggleVisibility);
   },
 
   get enabled() {
-    return this.contentBlockingUIEnabled ? this.contentBlockingEnabled : TrackingProtection.enabled;
+    return this.contentBlockingEnabled;
   },
 
   updateEnabled() {
     this.content.toggleAttribute("enabled", this.enabled);
 
-    if (this.contentBlockingUIEnabled) {
-      this.appMenuButton.setAttribute("tooltiptext", this.enabled ?
-        this.strings.disableTooltip : this.strings.enableTooltip);
-      this.appMenuButton.setAttribute("enabled", this.enabled);
-      this.appMenuButton.setAttribute("aria-pressed", this.enabled);
-    }
+    this.appMenuButton.setAttribute("tooltiptext", this.enabled ?
+      this.strings.disableTooltip : this.strings.enableTooltip);
+    this.appMenuButton.setAttribute("enabled", this.enabled);
+    this.appMenuButton.setAttribute("aria-pressed", this.enabled);
 
     // The enabled state of blockers may also change since it depends on this.enabled.
     for (let blocker of this.blockers) {
       blocker.categoryItem.classList.toggle("blocked", this.enabled && blocker.enabled);
     }
   },
 
-  updateUIEnabled() {
-    this.content.toggleAttribute("contentBlockingUI", this.contentBlockingUIEnabled);
-
-    if (this.contentBlockingUIEnabled) {
-      this.appMenuLabel.setAttribute("label", this.strings.appMenuTitle);
-      this.appMenuLabel.setAttribute("tooltiptext", this.strings.appMenuTooltip);
-    }
-
-    this.updateEnabled();
-  },
-
   onGlobalToggleCommand() {
-    if (this.contentBlockingUIEnabled) {
-      Services.prefs.setBoolPref(this.PREF_ENABLED, !this.enabled);
-    } else {
-      TrackingProtection.onGlobalToggleCommand();
-    }
+    Services.prefs.setBoolPref(this.PREF_ENABLED, !this.enabled);
   },
 
   hideIdentityPopupAndReload() {
     document.getElementById("identity-popup").hidePopup();
     BrowserReload();
   },
 
   openPreferences(origin) {
@@ -610,40 +540,32 @@ var ContentBlocking = {
       Services.prefs.savePrefFile(null);
     }
   },
 
   async showIntroPanel() {
     let brandBundle = document.getElementById("bundle_brand");
     let brandShortName = brandBundle.getString("brandShortName");
 
-    let introTitle;
+
+    let introTitle = gNavigatorBundle.getFormattedString("contentBlocking.intro.title",
+                                                         [brandShortName]);
     let introDescription;
     // This will be sent to the onboarding website to let them know which
     // UI variation we're showing.
     let variation;
-
-    if (this.contentBlockingUIEnabled) {
-      introTitle = gNavigatorBundle.getFormattedString("contentBlocking.intro.title",
-                                                       [brandShortName]);
-      // We show a different UI tour variation for users that already have TP
-      // enabled globally.
-      if (TrackingProtection.enabledGlobally) {
-        introDescription = gNavigatorBundle.getString("contentBlocking.intro.v2.description");
-        variation = 2;
-      } else {
-        introDescription = gNavigatorBundle.getFormattedString("contentBlocking.intro.v1.description",
-                                                               [brandShortName]);
-        variation = 1;
-      }
+    // We show a different UI tour variation for users that already have TP
+    // enabled globally.
+    if (TrackingProtection.enabledGlobally) {
+      introDescription = gNavigatorBundle.getString("contentBlocking.intro.v2.description");
+      variation = 2;
     } else {
-      introTitle = gNavigatorBundle.getString("trackingProtection.intro.title");
-      introDescription = gNavigatorBundle.getFormattedString("trackingProtection.intro.description2",
+      introDescription = gNavigatorBundle.getFormattedString("contentBlocking.intro.v1.description",
                                                              [brandShortName]);
-      variation = 0;
+      variation = 1;
     }
 
     let openStep2 = () => {
       // When the user proceeds in the tour, adjust the counter to indicate that
       // the user doesn't need to see the intro anymore.
       this.dontShowIntroPanelAgain();
 
       let nextURL = Services.urlFormatter.formatURLPref("privacy.trackingprotection.introURL") +
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -46,22 +46,18 @@
 #main-window[customize-entered] {
   min-width: -moz-fit-content;
 }
 
 .searchbar-textbox {
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-textbox");
 }
 
-.search-one-offs {
-  -moz-binding: url("chrome://browser/content/search/search.xml#search-one-offs");
-}
-
-.search-setting-button[compact=true],
-.search-setting-button-compact:not([compact=true]) {
+.search-one-offs[compact=true] .search-setting-button,
+.search-one-offs:not([compact=true]) .search-setting-button-compact {
   display: none;
 }
 
 /* Prevent shrinking the page content to 0 height and width */
 .browserStack > browser {
   min-height: 25px;
   min-width: 25px;
 }
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -65,16 +65,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
   TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
   Translation: "resource:///modules/translation/Translation.jsm",
   UITour: "resource:///modules/UITour.jsm",
   UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
   UrlbarInput: "resource:///modules/UrlbarInput.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
+  UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
   UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.jsm",
   Utils: "resource://gre/modules/sessionstore/Utils.jsm",
   Weave: "resource://services-sync/main.js",
   WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
   fxAccounts: "resource://gre/modules/FxAccounts.jsm",
   webrtcUI: "resource:///modules/webrtcUI.jsm",
   ZoomUI: "resource:///modules/ZoomUI.jsm",
 });
@@ -2460,90 +2461,16 @@ function loadURI(uri, referrer, postData
                  forceAboutBlankViewerInCurrent,
                  allowInheritPrincipal,
                });
   } catch (e) {
     Cu.reportError(e);
   }
 }
 
-/**
- * Given a string, will generate a more appropriate urlbar value if a Places
- * keyword or a search alias is found at the beginning of it.
- *
- * @param url
- *        A string that may begin with a keyword or an alias.
- *
- * @return {Promise}
- * @resolves { url, postData, mayInheritPrincipal }. If it's not possible
- *           to discern a keyword or an alias, url will be the input string.
- */
-async function getShortcutOrURIAndPostData(url) {
-  let mayInheritPrincipal = false;
-  let postData = null;
-  // Split on the first whitespace.
-  let [keyword, param = ""] = url.trim().split(/\s(.+)/, 2);
-
-  if (!keyword) {
-    return { url, postData, mayInheritPrincipal };
-  }
-
-  let engine = Services.search.getEngineByAlias(keyword);
-  if (engine) {
-    let submission = engine.getSubmission(param, null, "keyword");
-    return { url: submission.uri.spec,
-             postData: submission.postData,
-             mayInheritPrincipal };
-  }
-
-  // A corrupt Places database could make this throw, breaking navigation
-  // from the location bar.
-  let entry = null;
-  try {
-    entry = await PlacesUtils.keywords.fetch(keyword);
-  } catch (ex) {
-    Cu.reportError(`Unable to fetch Places keyword "${keyword}": ${ex}`);
-  }
-  if (!entry || !entry.url) {
-    // This is not a Places keyword.
-    return { url, postData, mayInheritPrincipal };
-  }
-
-  try {
-    [url, postData] =
-      await BrowserUtils.parseUrlAndPostData(entry.url.href,
-                                             entry.postData,
-                                             param);
-    if (postData) {
-      postData = getPostDataStream(postData);
-    }
-
-    // Since this URL came from a bookmark, it's safe to let it inherit the
-    // current document's principal.
-    mayInheritPrincipal = true;
-  } catch (ex) {
-    // It was not possible to bind the param, just use the original url value.
-  }
-
-  return { url, postData, mayInheritPrincipal };
-}
-
-function getPostDataStream(aPostDataString,
-                           aType = "application/x-www-form-urlencoded") {
-  let dataStream = Cc["@mozilla.org/io/string-input-stream;1"]
-                     .createInstance(Ci.nsIStringInputStream);
-  dataStream.data = aPostDataString;
-
-  let mimeStream = Cc["@mozilla.org/network/mime-input-stream;1"]
-                     .createInstance(Ci.nsIMIMEInputStream);
-  mimeStream.addHeader("Content-Type", aType);
-  mimeStream.setData(dataStream);
-  return mimeStream.QueryInterface(Ci.nsIInputStream);
-}
-
 function getLoadContext() {
   return window.docShell.QueryInterface(Ci.nsILoadContext);
 }
 
 function readFromClipboard() {
   var url;
 
   try {
@@ -3698,17 +3625,17 @@ var newTabButtonObserver = {
                                                                   window);
       if (!answer) {
         return;
       }
     }
 
     for (let link of links) {
       if (link.url) {
-        let data = await getShortcutOrURIAndPostData(link.url);
+        let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);
         // Allow third-party services to fixup this URL.
         openNewTabWith(data.url, shiftKey, {
           // TODO fix allowInheritPrincipal
           // (this is required by javascript: drop to the new window) Bug 1475201
           allowInheritPrincipal: true,
           postData: data.postData,
           allowThirdPartyFixup: true,
           triggeringPrincipal,
@@ -3733,17 +3660,17 @@ var newWindowButtonObserver = {
                                                                   window);
       if (!answer) {
         return;
       }
     }
 
     for (let link of links) {
       if (link.url) {
-        let data = await getShortcutOrURIAndPostData(link.url);
+        let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);
         // Allow third-party services to fixup this URL.
         openNewWindowWith(data.url, {
           // TODO fix allowInheritPrincipal
           // (this is required by javascript: drop to the new window) Bug 1475201
           allowInheritPrincipal: true,
           postData: data.postData,
           allowThirdPartyFixup: true,
           triggeringPrincipal,
@@ -4380,24 +4307,16 @@ function FillHistoryMenu(aParent) {
   // don't display the popup for a single item
   if (sessionHistory.entries.length <= 1)
     return false;
 
   updateSessionHistory(sessionHistory, true);
   return true;
 }
 
-function addToUrlbarHistory(aUrlToAdd) {
-  if (!PrivateBrowsingUtils.isWindowPrivate(window) &&
-      aUrlToAdd &&
-      !aUrlToAdd.includes(" ") &&
-      !/[\x00-\x1F]/.test(aUrlToAdd)) // eslint-disable-line no-control-regex
-    PlacesUIUtils.markPageAsTyped(aUrlToAdd);
-}
-
 function BrowserDownloadsUI() {
   if (PrivateBrowsingUtils.isWindowPrivate(window)) {
     openTrustedLinkIn("about:downloads", "tab");
   } else {
     PlacesCommandHook.showPlacesOrganizer("Downloads");
   }
 }
 
@@ -6235,26 +6154,26 @@ function middleMousePaste(event) {
   // if it's not the current tab, we don't need to do anything because the
   // browser doesn't exist.
   let where = whereToOpenLink(event, true, false);
   let lastLocationChange;
   if (where == "current") {
     lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
   }
 
-  getShortcutOrURIAndPostData(clipboard).then(data => {
+  UrlbarUtils.getShortcutOrURIAndPostData(clipboard).then(data => {
     try {
       makeURI(data.url);
     } catch (ex) {
       // Not a valid URI.
       return;
     }
 
     try {
-      addToUrlbarHistory(data.url);
+      UrlbarUtils.addToUrlbarHistory(data.url, window);
     } catch (ex) {
       // Things may go wrong when adding url to session history,
       // but don't let that interfere with the loading of the url.
       Cu.reportError(ex);
     }
 
     if (where != "current" ||
         lastLocationChange == gBrowser.selectedBrowser.lastLocationChange) {
@@ -6321,17 +6240,17 @@ function handleDroppedLink(event, urlOrL
       if (!answer) {
         return;
       }
     }
 
     let urls = [];
     let postDatas = [];
     for (let link of links) {
-      let data = await getShortcutOrURIAndPostData(link.url);
+      let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);
       urls.push(data.url);
       postDatas.push(data.postData);
     }
     if (lastLocationChange == gBrowser.selectedBrowser.lastLocationChange) {
       gBrowser.loadTabs(urls, {
         inBackground,
         replace: true,
         allowThirdPartyFixup: false,
--- a/browser/base/content/global-scripts.inc
+++ b/browser/base/content/global-scripts.inc
@@ -12,16 +12,17 @@
 xmlns="http://www.w3.org/1999/xhtml"
 #endif
 >
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 for (let script of [
   "chrome://browser/content/browser.js",
   "chrome://browser/content/search/searchbar.js",
+  "chrome://browser/content/search/search-one-offs.js",
 
   "chrome://browser/content/browser-captivePortal.js",
   "chrome://browser/content/browser-compacttheme.js",
   "chrome://browser/content/browser-contentblocking.js",
   "chrome://browser/content/browser-media.js",
   "chrome://browser/content/browser-pageActions.js",
   "chrome://browser/content/browser-places.js",
   "chrome://browser/content/browser-plugins.js",
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -296,18 +296,16 @@ skip-if = true # browser_drag.js is disa
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_fullscreen-window-open.js]
 tags = fullscreen
 skip-if = os == "linux" # Linux: Intermittent failures - bug 941575.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_gestureSupport.js]
 skip-if = e10s # Bug 863514 - no gesture support.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_getshortcutoruri.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_hide_removing.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_homeDrop.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_invalid_uri_back_forward_manipulation.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_keywordBookmarklets.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
--- a/browser/base/content/test/general/browser_contentAreaClick.js
+++ b/browser/base/content/test/general/browser_contentAreaClick.js
@@ -164,28 +164,42 @@ var gReplacedMethods = [
   "urlSecurityCheck",
   "loadURI",
   "gatherTextUnder",
   "saveURL",
   "openLinkIn",
   "getShortcutOrURIAndPostData",
 ];
 
+// Returns the target object for the replaced method.
+function getStub(replacedMethod) {
+  let targetObj = replacedMethod == "getShortcutOrURIAndPostData" ? UrlbarUtils : gTestWin;
+  return targetObj[replacedMethod];
+}
+
 // Reference to the new window.
 var gTestWin = null;
 
-// List of methods invoked by a specific call to contentAreaClick.
-var gInvokedMethods = [];
-
 // The test currently running.
 var gCurrentTest = null;
 
+var sandbox;
+
 function test() {
   waitForExplicitFinish();
 
+  /* global sinon */
+  Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js");
+  sandbox = sinon.sandbox.create();
+
+  registerCleanupFunction(function() {
+    sandbox.restore();
+    delete window.sinon;
+  });
+
   gTestWin = openDialog(location, "", "chrome,all,dialog=no", "about:blank");
   whenDelayedStartupFinished(gTestWin, function() {
     info("Browser window opened");
     waitForFocus(function() {
       info("Browser window focused");
       waitForFocus(function() {
         info("Setting up browser...");
         setupTestBrowserWindow();
@@ -205,50 +219,43 @@ var gClickHandler = {
 
     let isPanelClick = linkId == "panellink";
     gTestWin.contentAreaClick(event, isPanelClick);
     let prevent = event.defaultPrevented;
     is(prevent, gCurrentTest.preventDefault,
        gCurrentTest.desc + ": event.defaultPrevented is correct (" + prevent + ")");
 
     // Check that all required methods have been called.
-    gCurrentTest.expectedInvokedMethods.forEach(function(aExpectedMethodName) {
-      isnot(gInvokedMethods.indexOf(aExpectedMethodName), -1,
-            gCurrentTest.desc + ":" + aExpectedMethodName + " was invoked");
-    });
+    for (let expectedMethod of gCurrentTest.expectedInvokedMethods) {
+      ok(getStub(expectedMethod).called,
+        `${gCurrentTest.desc}:${expectedMethod} should have been invoked`);
+    }
 
-    if (gInvokedMethods.length != gCurrentTest.expectedInvokedMethods.length) {
-      ok(false, "Wrong number of invoked methods");
-      gInvokedMethods.forEach(method => info(method + " was invoked"));
+    for (let method of gReplacedMethods) {
+      if (getStub(method).called &&
+          !gCurrentTest.expectedInvokedMethods.includes(method)) {
+        ok(false, `Should have not called ${method}`);
+      }
     }
 
     event.preventDefault();
     event.stopPropagation();
 
     executeSoon(runNextTest);
   },
 };
 
-// Wraps around the methods' replacement mock function.
-function wrapperMethod(aInvokedMethods, aMethodName) {
-  return function() {
-    aInvokedMethods.push(aMethodName);
-    // At least getShortcutOrURIAndPostData requires to return url
-    return (aMethodName == "getShortcutOrURIAndPostData") ? arguments.url : arguments[0];
-  };
-}
-
 function setupTestBrowserWindow() {
   // Steal click events and don't propagate them.
   gTestWin.addEventListener("click", gClickHandler, true);
 
   // Replace methods.
-  gReplacedMethods.forEach(function(aMethodName) {
-    gTestWin["old_" + aMethodName] = gTestWin[aMethodName];
-    gTestWin[aMethodName] = wrapperMethod(gInvokedMethods, aMethodName);
+  gReplacedMethods.forEach(function(methodName) {
+    let targetObj = methodName == "getShortcutOrURIAndPostData" ? UrlbarUtils : gTestWin;
+    sandbox.stub(targetObj, methodName).returnsArg(0);
   });
 
   // Inject links in content.
   let doc = gTestWin.content.document;
   let mainDiv = doc.createElement("div");
   mainDiv.innerHTML =
     '<p><a id="commonlink" href="http://mochi.test/moz/">Common link</a></p>' +
     '<p><a id="panellink" href="http://mochi.test/moz/">Panel link</a></p>' +
@@ -274,32 +281,25 @@ function runNextTest() {
       gCurrentTest.setup();
     } else {
       finishTest();
       return;
     }
   }
 
   // Move to next target.
-  gInvokedMethods.length = 0;
+  sandbox.resetHistory();
   let target = gCurrentTest.targets.shift();
 
   info(gCurrentTest.desc + ": testing " + target);
 
   // Fire click event.
   let targetElt = gTestWin.content.document.getElementById(target);
   ok(targetElt, gCurrentTest.desc + ": target is valid (" + targetElt.id + ")");
   EventUtils.synthesizeMouseAtCenter(targetElt, gCurrentTest.event, gTestWin.content);
 }
 
 function finishTest() {
   info("Restoring browser...");
   gTestWin.removeEventListener("click", gClickHandler, true);
-
-  // Restore original methods.
-  gReplacedMethods.forEach(function(aMethodName) {
-    gTestWin[aMethodName] = gTestWin["old_" + aMethodName];
-    delete gTestWin["old_" + aMethodName];
-  });
-
   gTestWin.close();
   finish();
 }
--- a/browser/base/content/test/performance/browser_urlbar_keyed_search.js
+++ b/browser/base/content/test/performance/browser_urlbar_keyed_search.js
@@ -16,18 +16,18 @@ requestLongerTimeout(5);
 
 /* These reflows happen only the first time the awesomebar panel opens. */
 const EXPECTED_REFLOWS_FIRST_OPEN = [];
 if (AppConstants.DEBUG ||
     AppConstants.platform == "win" ||
     AppConstants.platform == "macosx") {
   EXPECTED_REFLOWS_FIRST_OPEN.push({
     stack: [
-      "_rebuild@chrome://browser/content/search/search.xml",
-      "set_popup@chrome://browser/content/search/search.xml",
+      "_rebuild@chrome://browser/content/search/search-one-offs.js",
+      "set popup@chrome://browser/content/search/search-one-offs.js",
       "set_oneOffSearchesEnabled@chrome://browser/content/urlbarBindings.xml",
       "_enableOrDisableOneOffSearches@chrome://browser/content/urlbarBindings.xml",
       "@chrome://browser/content/urlbarBindings.xml",
       "_openAutocompletePopup@chrome://browser/content/urlbarBindings.xml",
       "openAutocompletePopup@chrome://browser/content/urlbarBindings.xml",
       "openPopup@chrome://global/content/bindings/autocomplete.xml",
       "set_popupOpen@chrome://global/content/bindings/autocomplete.xml",
     ],
--- a/browser/base/content/test/performance/browser_urlbar_search.js
+++ b/browser/base/content/test/performance/browser_urlbar_search.js
@@ -17,18 +17,18 @@ requestLongerTimeout(5);
 /* These reflows happen only the first time the awesomebar panel opens. */
 const EXPECTED_REFLOWS_FIRST_OPEN = [];
 if (AppConstants.DEBUG ||
     AppConstants.platform == "linux" ||
     AppConstants.platform == "macosx" ||
     AppConstants.isPlatformAndVersionAtLeast("win", "10")) {
   EXPECTED_REFLOWS_FIRST_OPEN.push({
     stack: [
-      "_rebuild@chrome://browser/content/search/search.xml",
-      "set_popup@chrome://browser/content/search/search.xml",
+      "_rebuild@chrome://browser/content/search/search-one-offs.js",
+      "set popup@chrome://browser/content/search/search-one-offs.js",
       "set_oneOffSearchesEnabled@chrome://browser/content/urlbarBindings.xml",
       "_enableOrDisableOneOffSearches@chrome://browser/content/urlbarBindings.xml",
       "@chrome://browser/content/urlbarBindings.xml",
       "_openAutocompletePopup@chrome://browser/content/urlbarBindings.xml",
       "openAutocompletePopup@chrome://browser/content/urlbarBindings.xml",
       "openPopup@chrome://global/content/bindings/autocomplete.xml",
       "set_popupOpen@chrome://global/content/bindings/autocomplete.xml",
     ],
--- a/browser/base/content/test/trackingUI/browser_trackingUI_appMenu_toggle.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_appMenu_toggle.js
@@ -1,24 +1,22 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const CB_PREF = "browser.contentblocking.enabled";
-const CB_UI_PREF = "browser.contentblocking.ui.enabled";
 const TOGGLE_PREF = "browser.contentblocking.global-toggle.enabled";
 
 ChromeUtils.import("resource://testing-common/CustomizableUITestUtils.jsm", this);
 
 // Test that the app menu toggle correctly flips the TP pref in
 // normal windows and private windows.
 add_task(async function testGlobalToggle() {
   await SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
     [TOGGLE_PREF, true],
   ]});
 
   let panelUIButton = await TestUtils.waitForCondition(() => document.getElementById("PanelUI-menu-button"));
 
   info("Opening main menu");
 
   let promiseShown = BrowserTestUtils.waitForEvent(PanelUI.mainView, "ViewShown");
@@ -38,56 +36,8 @@ add_task(async function testGlobalToggle
   toggle.click();
   is(Services.prefs.getBoolPref(CB_PREF), false);
 
   toggle.click();
   is(Services.prefs.getBoolPref(CB_PREF), true);
 
   Services.prefs.clearUserPref(CB_PREF);
 });
-
-// Test that the app menu toggle correctly flips the TP pref in
-// normal windows and private windows.
-add_task(async function testGlobalToggleTP() {
-  await SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, false],
-    [TOGGLE_PREF, true],
-  ]});
-
-  async function runTest(privateWindow) {
-    let win = await BrowserTestUtils.openNewBrowserWindow({private: privateWindow});
-
-    let panelUIButton = await TestUtils.waitForCondition(() => win.document.getElementById("PanelUI-menu-button"));
-
-    let prefName = privateWindow ? "privacy.trackingprotection.pbmode.enabled" :
-      "privacy.trackingprotection.enabled";
-
-    info("Opening main menu");
-
-    let promiseShown = BrowserTestUtils.waitForEvent(win.PanelUI.mainView, "ViewShown");
-    panelUIButton.click();
-    await promiseShown;
-
-    info("Opened main menu");
-
-    let toggle = win.document.getElementById("appMenu-tp-toggle");
-
-    Services.prefs.setBoolPref(prefName, false);
-    await TestUtils.waitForCondition(() => toggle.getAttribute("enabled") == "false");
-
-    Services.prefs.setBoolPref(prefName, true);
-    await TestUtils.waitForCondition(() => toggle.getAttribute("enabled") == "true");
-
-    toggle.click();
-    is(Services.prefs.getBoolPref(prefName), false);
-
-    toggle.click();
-    is(Services.prefs.getBoolPref(prefName), true);
-
-    Services.prefs.clearUserPref(prefName);
-
-    await BrowserTestUtils.closeWindow(win);
-  }
-
-  // Run once in private and once in normal window.
-  await runTest(true);
-  await runTest(false);
-});
--- a/browser/base/content/test/trackingUI/browser_trackingUI_open_preferences.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_open_preferences.js
@@ -1,15 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const CB_PREF = "browser.contentblocking.enabled";
-const CB_UI_PREF = "browser.contentblocking.ui.enabled";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const FB_PREF = "browser.fastblock.enabled";
 const TPC_PREF = "network.cookie.cookieBehavior";
 const FB_UI_PREF = "browser.contentblocking.fastblock.control-center.ui.enabled";
 const TP_UI_PREF = "browser.contentblocking.trackingprotection.control-center.ui.enabled";
 const RT_UI_PREF = "browser.contentblocking.rejecttrackers.control-center.ui.enabled";
 const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
 
@@ -64,17 +63,16 @@ add_task(async function testOpenPreferen
   });
 });
 
 // Tests that clicking the contentblocking category items "add blocking" labels
 // links to about:preferences
 add_task(async function testOpenPreferencesFromAddBlockingButtons() {
   SpecialPowers.pushPrefEnv({set: [
     [CB_PREF, true],
-    [CB_UI_PREF, true],
     [FB_PREF, false],
     [TP_PREF, false],
     [TPC_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT],
     [FB_UI_PREF, true],
     [TP_UI_PREF, true],
     [RT_UI_PREF, true],
   ]});
 
--- a/browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
@@ -1,16 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test that sites added to the Tracking Protection whitelist in private
 // browsing mode don't persist once the private browsing window closes.
 
 const CB_PREF = "browser.contentblocking.enabled";
-const CB_UI_PREF = "browser.contentblocking.ui.enabled";
 const TP_PB_PREF = "privacy.trackingprotection.enabled";
 const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
 var TrackingProtection = null;
 var ContentBlocking = null;
 var browser = null;
 
 registerCleanupFunction(function() {
   Services.prefs.clearUserPref(TP_PB_PREF);
@@ -56,23 +55,21 @@ function testTrackingPage(window) {
   } else {
     ok(!hidden("#tracking-action-unblock"), "unblockButton is visible");
     ok(hidden("#tracking-action-unblock-private"), "unblockButtonPrivate is hidden");
   }
 
   ok(hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is hidden");
   ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
-    ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
-      "TP category item is not showing add blocking");
-    ok(!hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
-      "TP category item is set to blocked");
-  }
+  ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
+  ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
+    "TP category item is not showing add blocking");
+  ok(!hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
+    "TP category item is set to blocked");
 }
 
 function testTrackingPageUnblocked() {
   info("Tracking content must be white-listed and not blocked");
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(ContentBlocking.content.hasAttribute("hasException"), "content shows exception");
 
   ok(!ContentBlocking.iconBox.hasAttribute("active"), "shield is active");
@@ -83,23 +80,21 @@ function testTrackingPageUnblocked() {
   ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
   ok(!hidden("#tracking-action-block"), "blockButton is visible");
   ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
   ok(!hidden("#identity-popup-content-blocking-disabled-label"), "disabled label is visible");
 
   ok(hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is hidden");
   ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
-    ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
-      "TP category item is not showing add blocking");
-    ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
-      "TP category item is not set to blocked");
-  }
+  ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
+  ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
+    "TP category item is not showing add blocking");
+  ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
+    "TP category item is not set to blocked");
 }
 
 add_task(async function testExceptionAddition() {
   await UrlClassifierTestUtils.addTestTrackers();
   let privateWin = await BrowserTestUtils.openNewBrowserWindow({private: true});
   browser = privateWin.gBrowser;
   let tab = await BrowserTestUtils.openNewForegroundTab({ gBrowser: browser, waitForLoad: true, waitForStateStop: true });
 
--- a/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
@@ -3,29 +3,25 @@
 
 "use strict";
 
 const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
 const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
 const COOKIE_PAGE = "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
 
 const CB_PREF = "browser.contentblocking.enabled";
-const CB_UI_PREF = "browser.contentblocking.ui.enabled";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const PREF_REPORT_BREAKAGE_ENABLED = "browser.contentblocking.reportBreakage.enabled";
 const PREF_REPORT_BREAKAGE_URL = "browser.contentblocking.reportBreakage.url";
 
 let {HttpServer} = ChromeUtils.import("resource://testing-common/httpd.js", {});
 let {CommonUtils} = ChromeUtils.import("resource://services-common/utils.js", {});
 let {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm", {});
 
 add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
-  ]});
   await UrlClassifierTestUtils.addTestTrackers();
 
   let oldCanRecord = Services.telemetry.canRecordExtended;
   Services.telemetry.canRecordExtended = true;
 
   registerCleanupFunction(() => {
     Services.telemetry.canRecordExtended = oldCanRecord;
   });
--- a/browser/base/content/test/trackingUI/browser_trackingUI_state.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_state.js
@@ -10,17 +10,16 @@
  *   With TP disabled
  *     1) A page with no tracking elements is loaded.
  *     2) A page with tracking elements is loaded.
  *
  * See also Bugs 1175327, 1043801, 1178985
  */
 
 const CB_PREF = "browser.contentblocking.enabled";
-const CB_UI_PREF = "browser.contentblocking.ui.enabled";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TP_PB_PREF = "privacy.trackingprotection.pbmode.enabled";
 const FB_PREF = "browser.fastblock.enabled";
 const FB_TIMEOUT_PREF = "browser.fastblock.timeout";
 const FB_LIMIT_PREF = "browser.fastblock.limit";
 const TPC_PREF = "network.cookie.cookieBehavior";
 const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
 const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
@@ -75,20 +74,17 @@ function testBenignPage() {
   ok(BrowserTestUtils.is_hidden(ContentBlocking.iconBox), "icon box is hidden");
   ok(hidden("#tracking-action-block"), "blockButton is hidden");
   ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
   is(!hidden("#identity-popup-content-blocking-disabled-label"), !ContentBlocking.enabled,
     "disabled label is visible if CB is off");
 
   ok(!hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is visible");
   ok(hidden("#identity-popup-content-blocking-detected"), "blocking detected label is hidden");
-
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    ok(hidden("#identity-popup-content-blocking-category-list"), "category list is hidden");
-  }
+  ok(hidden("#identity-popup-content-blocking-category-list"), "category list is hidden");
 }
 
 function testBenignPageWithException() {
   info("Non-tracking content must not be blocked");
   ok(!ContentBlocking.content.hasAttribute("detected"), "no trackers are detected");
   ok(ContentBlocking.content.hasAttribute("hasException"), "content shows exception");
   ok(!ContentBlocking.content.hasAttribute("active"), "content is not active");
 
@@ -102,20 +98,17 @@ function testBenignPageWithException() {
     "icon box is not hidden if CB is on");
   is(!hidden("#tracking-action-block"), ContentBlocking.enabled,
      "blockButton is visible if CB is on");
   ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
   ok(!hidden("#identity-popup-content-blocking-disabled-label"), "disabled label is visible");
 
   ok(!hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is visible");
   ok(hidden("#identity-popup-content-blocking-detected"), "blocking detected label is hidden");
-
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    ok(hidden("#identity-popup-content-blocking-category-list"), "category list is hidden");
-  }
+  ok(hidden("#identity-popup-content-blocking-category-list"), "category list is hidden");
 }
 
 function areTrackersBlocked(isPrivateBrowsing) {
   let cbEnabled = Services.prefs.getBoolPref(CB_PREF);
   let blockedByTP = cbEnabled &&
                     Services.prefs.getBoolPref(isPrivateBrowsing ? TP_PB_PREF : TP_PREF);
   let blockedByFB = cbEnabled &&
                     Services.prefs.getBoolPref(FB_PREF) &&
@@ -143,45 +136,42 @@ function testTrackingPage(window) {
   ok(!ContentBlocking.iconBox.hasAttribute("hasException"), "icon box shows no exception");
   is(ContentBlocking.iconBox.getAttribute("tooltiptext"),
      blockedByTP ? gNavigatorBundle.getString("trackingProtection.icon.activeTooltip") : "",
      "correct tooltip");
 
   ok(hidden("#tracking-action-block"), "blockButton is hidden");
 
   let isWindowPrivate = PrivateBrowsingUtils.isWindowPrivate(window);
-  let cbUIEnabled = Services.prefs.getBoolPref(CB_UI_PREF);
   if (isWindowPrivate) {
     ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
     is(!hidden("#tracking-action-unblock-private"), blockedByTP,
        "unblockButtonPrivate is" + (blockedByTP ? "" : " not") + " visible");
   } else {
     ok(hidden("#tracking-action-unblock-private"), "unblockButtonPrivate is hidden");
     is(!hidden("#tracking-action-unblock"), blockedByTP,
        "unblockButton is" + (blockedByTP ? "" : " not") + " visible");
   }
 
   ok(hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is hidden");
   ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
 
-  if (cbUIEnabled) {
-    ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
-    let category;
-    if (Services.prefs.getBoolPref(FB_PREF)) {
-      category = "#identity-popup-content-blocking-category-fastblock";
-    } else {
-      category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
-                   "#identity-popup-content-blocking-category-3rdpartycookies" :
-                   "#identity-popup-content-blocking-category-tracking-protection";
-    }
-    is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
-      "Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
-    is(hidden(category + " > .identity-popup-content-blocking-category-state-label"), !blockedByTP,
-      "Category item is" + (blockedByTP ? "" : " not") + " set to blocked");
+  ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
+  let category;
+  if (Services.prefs.getBoolPref(FB_PREF)) {
+    category = "#identity-popup-content-blocking-category-fastblock";
+  } else {
+    category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
+                 "#identity-popup-content-blocking-category-3rdpartycookies" :
+                 "#identity-popup-content-blocking-category-tracking-protection";
   }
+  is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
+    "Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
+  is(hidden(category + " > .identity-popup-content-blocking-category-state-label"), !blockedByTP,
+    "Category item is" + (blockedByTP ? "" : " not") + " set to blocked");
 
   if (Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER) {
     ok(hidden("#identity-popup-content-blocking-category-label-default"),
       "Not showing default cookie restrictions label.");
     ok(!hidden("#identity-popup-content-blocking-category-label-trackers"),
       "Showing trackers cookie restrictions label.");
   } else {
     ok(hidden("#identity-popup-content-blocking-category-label-trackers"),
@@ -191,20 +181,17 @@ function testTrackingPage(window) {
   }
 }
 
 function testTrackingPageUnblocked(blockedByTP, window) {
   info("Tracking content must be white-listed and not blocked");
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(ContentBlocking.content.hasAttribute("hasException"), "content shows exception");
 
-  let isWindowPrivate = PrivateBrowsingUtils.isWindowPrivate(window);
-  let cbUIEnabled = Services.prefs.getBoolPref(CB_UI_PREF);
-  let tpEnabled = isWindowPrivate ? Services.prefs.getBoolPref(TP_PB_PREF) : Services.prefs.getBoolPref(TP_PREF);
-  let blockingEnabled = cbUIEnabled ? Services.prefs.getBoolPref(CB_PREF) : tpEnabled;
+  let blockingEnabled = Services.prefs.getBoolPref(CB_PREF);
   ok(!ContentBlocking.content.hasAttribute("active"), "content is not active");
   ok(!ContentBlocking.iconBox.hasAttribute("active"), "shield is not active");
   is(ContentBlocking.iconBox.hasAttribute("hasException"), blockingEnabled,
      "shield" + (blockingEnabled ? " shows" : " doesn't show") + " exception");
   is(ContentBlocking.iconBox.getAttribute("tooltiptext"),
      gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"), "correct tooltip");
 
   is(BrowserTestUtils.is_visible(ContentBlocking.iconBox), blockingEnabled,
@@ -212,32 +199,30 @@ function testTrackingPageUnblocked(block
   is(hidden("#tracking-action-block"), !blockingEnabled,
      "blockButton is" + (blockingEnabled ? " not" : "") + " visible");
   ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
   ok(!hidden("#identity-popup-content-blocking-disabled-label"), "disabled label is visible");
 
   ok(hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is hidden");
   ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
-    let category;
-    if (Services.prefs.getBoolPref(FB_PREF)) {
-      category = "#identity-popup-content-blocking-category-fastblock";
-    } else {
-      category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
-                   "#identity-popup-content-blocking-category-3rdpartycookies" :
-                   "#identity-popup-content-blocking-category-tracking-protection";
-    }
-    is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
-      "Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
-    // Always hidden no matter if blockedByTP or not, since we have an exception.
-    ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
-      "TP category item is not set to blocked");
+  ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
+  let category;
+  if (Services.prefs.getBoolPref(FB_PREF)) {
+    category = "#identity-popup-content-blocking-category-fastblock";
+  } else {
+    category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
+                 "#identity-popup-content-blocking-category-3rdpartycookies" :
+                 "#identity-popup-content-blocking-category-tracking-protection";
   }
+  is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
+    "Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
+  // Always hidden no matter if blockedByTP or not, since we have an exception.
+  ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
+    "TP category item is not set to blocked");
 }
 
 function testTrackingPageWithCBDisabled() {
   info("Tracking content must be white-listed and not blocked");
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(!ContentBlocking.content.hasAttribute("hasException"), "content shows no exception");
   ok(!ContentBlocking.content.hasAttribute("active"), "content is not active");
 
@@ -248,23 +233,21 @@ function testTrackingPageWithCBDisabled(
   ok(BrowserTestUtils.is_hidden(ContentBlocking.iconBox), "icon box is hidden");
   ok(hidden("#tracking-action-block"), "blockButton is hidden");
   ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
   ok(!hidden("#identity-popup-content-blocking-disabled-label"), "disabled label is visible");
 
   ok(hidden("#identity-popup-content-blocking-not-detected"), "blocking not detected label is hidden");
   ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
-    ok(!hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
-      "TP category item is showing add blocking");
-    ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
-      "TP category item is not set to blocked");
-  }
+  ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
+  ok(!hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-add-blocking"),
+    "TP category item is showing add blocking");
+  ok(hidden("#identity-popup-content-blocking-category-tracking-protection > .identity-popup-content-blocking-category-state-label"),
+    "TP category item is not set to blocked");
 }
 
 async function testContentBlockingEnabled(tab) {
   info("Testing with Tracking Protection ENABLED.");
 
   info("Load a test page not containing tracking elements");
   await promiseTabLoadEvent(tab, BENIGN_PAGE);
   testBenignPage();
@@ -348,40 +331,30 @@ add_task(async function testNormalBrowsi
   is(TrackingProtection.enabled, Services.prefs.getBoolPref(TP_PREF),
      "TP.enabled is based on the original pref value");
 
   Services.prefs.setBoolPref(FB_PREF, false);
   Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT);
 
   await testContentBlockingEnabled(tab);
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    Services.prefs.setBoolPref(CB_PREF, false);
-    ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
-  } else {
-    Services.prefs.setBoolPref(TP_PREF, false);
-    ok(!TrackingProtection.enabled, "TP is disabled after setting the pref");
-  }
+  Services.prefs.setBoolPref(CB_PREF, false);
+  ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   Services.prefs.setBoolPref(TP_PREF, true);
   ok(TrackingProtection.enabled, "TP is enabled after setting the pref");
   Services.prefs.setBoolPref(CB_PREF, true);
   ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
 
   await testContentBlockingEnabled(tab);
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    Services.prefs.setBoolPref(CB_PREF, false);
-    ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
-  } else {
-    Services.prefs.setBoolPref(TP_PREF, false);
-    ok(!TrackingProtection.enabled, "TP is disabled after setting the pref");
-  }
+  Services.prefs.setBoolPref(CB_PREF, false);
+  ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   gBrowser.removeCurrentTab();
 
   Services.prefs.clearUserPref(FB_PREF);
   Services.prefs.clearUserPref(TPC_PREF);
 });
@@ -401,55 +374,40 @@ add_task(async function testPrivateBrows
   ok(ContentBlocking, "CB is attached to the private window");
   TrackingProtection = tabbrowser.ownerGlobal.TrackingProtection;
   ok(TrackingProtection, "TP is attached to the private window");
   is(TrackingProtection.enabled, Services.prefs.getBoolPref(TP_PB_PREF),
      "TP.enabled is based on the pb pref value");
 
   await testContentBlockingEnabled(tab);
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    Services.prefs.setBoolPref(CB_PREF, false);
-    ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
-  } else {
-    Services.prefs.setBoolPref(TP_PB_PREF, false);
-    ok(!TrackingProtection.enabled, "TP is disabled after setting the pref");
-  }
+  Services.prefs.setBoolPref(CB_PREF, false);
+  ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   Services.prefs.setBoolPref(TP_PB_PREF, true);
   ok(TrackingProtection.enabled, "TP is enabled after setting the pref");
   Services.prefs.setBoolPref(CB_PREF, true);
   ok(TrackingProtection.enabled, "CB is enabled after setting the pref");
 
   await testContentBlockingEnabled(tab);
 
-  if (Services.prefs.getBoolPref(CB_UI_PREF)) {
-    Services.prefs.setBoolPref(CB_PREF, false);
-    ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
-  } else {
-    Services.prefs.setBoolPref(TP_PB_PREF, false);
-    ok(!TrackingProtection.enabled, "TP is disabled after setting the pref");
-  }
+  Services.prefs.setBoolPref(CB_PREF, false);
+  ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   privateWin.close();
 
   Services.prefs.clearUserPref(FB_PREF);
   Services.prefs.clearUserPref(TPC_PREF);
 });
 
 add_task(async function testFastBlock() {
-  if (!SpecialPowers.getBoolPref(CB_UI_PREF)) {
-    info("The FastBlock test is disabled when the Content Blocking UI is disabled");
-    return;
-  }
-
   await UrlClassifierTestUtils.addTestTrackers();
 
   tabbrowser = gBrowser;
   let tab = tabbrowser.selectedTab = BrowserTestUtils.addTab(tabbrowser);
 
   Services.prefs.setBoolPref(FB_PREF, false);
   Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT);
 
@@ -459,50 +417,43 @@ add_task(async function testFastBlock() 
   ok(FastBlock, "TP is attached to the browser window");
   is(FastBlock.enabled, Services.prefs.getBoolPref(FB_PREF),
      "FB.enabled is based on the original pref value");
   Services.prefs.setBoolPref(CB_PREF, true);
   ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
 
   await testContentBlockingEnabled(tab);
 
-  ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
   Services.prefs.setBoolPref(CB_PREF, false);
   ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   Services.prefs.setBoolPref(FB_PREF, true);
   Services.prefs.setIntPref(FB_TIMEOUT_PREF, 0);
   Services.prefs.setIntPref(FB_LIMIT_PREF, 0);
   ok(FastBlock.enabled, "FB is enabled after setting the pref");
   Services.prefs.setBoolPref(CB_PREF, true);
   ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
 
   await testContentBlockingEnabled(tab);
 
-  ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
   Services.prefs.setBoolPref(CB_PREF, false);
   ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   Services.prefs.clearUserPref(FB_PREF);
   Services.prefs.clearUserPref(FB_TIMEOUT_PREF);
   Services.prefs.clearUserPref(FB_LIMIT_PREF);
   Services.prefs.clearUserPref(TPC_PREF);
   gBrowser.removeCurrentTab();
 });
 
 add_task(async function testThirdPartyCookies() {
-  if (!SpecialPowers.getBoolPref(CB_UI_PREF)) {
-    info("The ThirdPartyCookies test is disabled when the Content Blocking UI is disabled");
-    return;
-  }
-
   await UrlClassifierTestUtils.addTestTrackers();
   gTrackingPageURL = COOKIE_PAGE;
 
   Services.prefs.setBoolPref(FB_PREF, false);
 
   tabbrowser = gBrowser;
   let tab = tabbrowser.selectedTab = BrowserTestUtils.addTab(tabbrowser);
 
@@ -513,30 +464,28 @@ add_task(async function testThirdPartyCo
   is(ThirdPartyCookies.enabled,
      Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER,
      "TPC.enabled is based on the original pref value");
   Services.prefs.setBoolPref(CB_PREF, true);
   ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
 
   await testContentBlockingEnabled(tab);
 
-  ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
   Services.prefs.setBoolPref(CB_PREF, false);
   ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER);
   ok(ThirdPartyCookies.enabled, "TPC is enabled after setting the pref");
   Services.prefs.setBoolPref(CB_PREF, true);
   ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
 
   await testContentBlockingEnabled(tab);
 
-  ok(Services.prefs.getBoolPref(CB_UI_PREF), "CB UI must be enabled here");
   Services.prefs.setBoolPref(CB_PREF, false);
   ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
 
   await testContentBlockingDisabled(tab);
 
   Services.prefs.clearUserPref(FB_PREF);
   Services.prefs.clearUserPref(TPC_PREF);
   gBrowser.removeCurrentTab();
--- a/browser/base/content/test/urlbar/browser_urlbarOneOffs_settings.js
+++ b/browser/base/content/test/urlbar/browser_urlbarOneOffs_settings.js
@@ -54,18 +54,19 @@ async function selectSettings(activateFn
       "Should have opened the search preferences pane");
   });
 }
 
 add_task(async function test_open_settings_with_enter() {
   await selectSettings(() => {
     EventUtils.synthesizeKey("KEY_ArrowUp");
 
-    Assert.equal(gURLBar.popup.oneOffSearchButtons.selectedButton.getAttribute("anonid"),
-      "search-settings-compact", "Should have selected the settings button");
+    Assert.ok(gURLBar.popup.oneOffSearchButtons.selectedButton
+      .classList.contains("search-setting-button-compact"),
+      "Should have selected the settings button");
 
     EventUtils.synthesizeKey("KEY_Enter");
   });
 });
 
 add_task(async function test_open_settings_with_click() {
   await selectSettings(() => {
     gURLBar.popup.oneOffSearchButtons.settingsButton.click();
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -716,17 +716,17 @@ file, You can obtain one at http://mozil
                 }
                 url = action.params.url;
                 break;
               case "remotetab":
                 url = action.params.url;
                 break;
               case "keyword":
                 if (action.params.postData) {
-                  postData = getPostDataStream(action.params.postData);
+                  postData = UrlbarUtils.getPostDataStream(action.params.postData);
                 }
                 mayInheritPrincipal = true;
                 url = action.params.url;
                 break;
               case "switchtab":
                 url = action.params.url;
                 if (this.hasAttribute("actiontype")) {
                   this.handleRevert();
@@ -778,17 +778,17 @@ file, You can obtain one at http://mozil
             // This is a fallback for add-ons and old testing code that directly
             // set value and try to confirm it. UnifiedComplete should always
             // resolve to a valid url.
             try {
               url = url.trim();
               new URL(url);
             } catch (ex) {
               let lastLocationChange = browser.lastLocationChange;
-              getShortcutOrURIAndPostData(url).then(data => {
+              UrlbarUtils.getShortcutOrURIAndPostData(url).then(data => {
                 if (where != "current" ||
                     browser.lastLocationChange == lastLocationChange) {
                   this._loadURL(data.url, browser, data.postData, where,
                                 openUILinkParams, data.mayInheritPrincipal,
                                 triggeringPrincipal);
                 }
               });
               return;
@@ -828,17 +828,17 @@ file, You can obtain one at http://mozil
         <parameter name="triggeringPrincipal"/>
         <body><![CDATA[
           this.value = url;
           browser.userTypedValue = url;
           if (gInitialPages.includes(url)) {
             browser.initialPageLoadedFromURLBar = url;
           }
           try {
-            addToUrlbarHistory(url);
+            UrlbarUtils.addToUrlbarHistory(url, window);
           } catch (ex) {
             // Things may go wrong when adding url to session history,
             // but don't let that interfere with the loading of the url.
             Cu.reportError(ex);
           }
 
           let params = {
             postData,
@@ -1871,22 +1871,22 @@ file, You can obtain one at http://mozil
                      onclick="openPreferences('paneSearch', {origin: 'searchChangeSettings'});"
                      control="search-suggestions-change-settings"/>
         </xul:hbox>
       </xul:deck>
       <xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox"
                        flex="1"/>
       <xul:hbox anonid="footer">
         <children/>
-        <xul:vbox anonid="one-off-search-buttons"
-                  class="search-one-offs"
-                  compact="true"
-                  includecurrentengine="true"
-                  disabletab="true"
-                  flex="1"/>
+        <xul:search-one-offs anonid="one-off-search-buttons"
+                             class="search-one-offs"
+                             compact="true"
+                             includecurrentengine="true"
+                             disabletab="true"
+                             flex="1"/>
       </xul:hbox>
     </content>
 
     <implementation>
       <!--
         For performance reasons we want to limit the size of the text runs we
         build and show to the user.
       -->
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -54,34 +54,30 @@
       </hbox>
 
       <!-- Tracking Protection Section -->
       <hbox id="tracking-protection-container"
             class="identity-popup-section"
             when-connection="not-secure secure secure-ev secure-cert-user-overridden extension">
         <vbox id="identity-popup-content-blocking-content" flex="1">
           <hbox align="start">
-            <label id="tracking-protection-label"
-                   class="identity-popup-headline"
-                   flex="1">&trackingProtection.title;</label>
             <label id="content-blocking-label"
                    class="identity-popup-headline"
                    flex="1">&contentBlocking.title;</label>
             <hbox id="identity-popup-content-blocking-disabled-label">
               <image/>
               <label id="identity-popup-content-blocking-disabled-label-exception"
                      value="&contentBlocking.disabled.label;"
                      tooltiptext="&contentBlocking.exception.tooltip;"/>
               <label id="identity-popup-content-blocking-disabled-label-global"
                      value="&contentBlocking.disabled.label;"
                      tooltiptext="&contentBlocking.disabled.tooltip;"/>
             </hbox>
             <toolbarbutton id="tracking-protection-preferences-button"
                            class="identity-popup-preferences-button subviewbutton"
-                           tooltiptext="&trackingProtection.tooltip;"
                            oncommand="ContentBlocking.openPreferences('identityPopup-TP-preferencesButton'); gIdentityHandler.recordClick('cb_prefs_button');" />
           </hbox>
 
           <description id="identity-popup-content-blocking-detected"
                        crop="end">&contentBlocking.detected;</description>
           <description id="identity-popup-content-blocking-not-detected"
                        crop="end">&contentBlocking.notDetected;</description>
 
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -221,20 +221,18 @@
                          class="subviewbutton subviewbutton-iconic"
                          onmouseover="gSync.refreshSyncButtonsTooltip();"
                          oncommand="gSync.doSync();"
                          closemenu="none"/>
         </toolbaritem>
         <toolbarseparator class="sync-ui-item"/>
         <toolbaritem closemenu="none">
           <toolbarbutton id="appMenu-tp-label"
-                         tooltiptext="&trackingProtection.tooltip;"
                          class="subviewbutton subviewbutton-iconic"
-                         oncommand="ContentBlocking.openPreferences('appMenu-trackingprotection'); PanelUI.hide();"
-                         label="&trackingProtection.title;"/>
+                         oncommand="ContentBlocking.openPreferences('appMenu-trackingprotection'); PanelUI.hide();"/>
           <toolbarseparator id="appMenu-tp-vertical-separator" orient="vertical"/>
           <toolbarbutton id="appMenu-tp-toggle"
                          enabled="false"
                          oncommand="ContentBlocking.onGlobalToggleCommand();" />
         </toolbaritem>
         <toolbarseparator id="appMenu-tp-separator"/>
         <toolbarbutton id="appMenu-new-window-button"
                        class="subviewbutton subviewbutton-iconic"
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js
@@ -28,19 +28,17 @@ async function test_opensearch(shouldWor
   let promiseSearchPopupShown = BrowserTestUtils.waitForEvent(searchPopup, "popupshown");
   let searchBarButton = searchBar.querySelector(".searchbar-search-button");
 
   searchBarButton.click();
   await promiseSearchPopupShown;
   let oneOffsContainer = document.getAnonymousElementByAttribute(searchPopup,
                                                                  "anonid",
                                                                  "search-one-off-buttons");
-  let engineListElement = document.getAnonymousElementByAttribute(oneOffsContainer,
-                                                                  "anonid",
-                                                                  "add-engines");
+  let engineListElement = oneOffsContainer.querySelector(".search-add-engines");
   if (shouldWork) {
     ok(engineListElement.firstElementChild,
        "There should be search engines available to add");
     ok(searchBar.getAttribute("addengines"),
        "Search bar should have addengines attribute");
   } else {
     is(engineListElement.firstElementChild, null,
        "There should be no search engines available to add");
--- a/browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_addKeywordForThisSearch.js
@@ -41,17 +41,17 @@ add_task(async function() {
       Assert.equal(entry.url.href, TEST_URL, "URL is correct");
       Assert.equal(entry.postData, "accenti%3D%E0%E8%EC%F2%F9&search%3D%25s", "POST data is correct");
 
       info("Check the charset has been saved");
       let pageInfo = await PlacesUtils.history.fetch(TEST_URL, {includeAnnotations: true});
       Assert.equal(pageInfo.annotations.get(PlacesUtils.CHARSET_ANNO), "windows-1252", "charset is correct");
 
       // Now check getShortcutOrURI.
-      let data = await getShortcutOrURIAndPostData("kw test");
+      let data = await UrlbarUtils.getShortcutOrURIAndPostData("kw test");
       Assert.equal(getPostDataString(data.postData), "accenti=\u00E0\u00E8\u00EC\u00F2\u00F9&search=test", "getShortcutOrURI POST data is correct");
       Assert.equal(data.url, TEST_URL, "getShortcutOrURI URL is correct");
     }, closeHandler);
   });
 });
 
 add_task(async function reopen_same_field() {
   await PlacesUtils.keywords.insert({
--- a/browser/components/preferences/in-content/extensionControlled.js
+++ b/browser/components/preferences/in-content/extensionControlled.js
@@ -12,19 +12,16 @@ ChromeUtils.defineModuleGetter(this, "Ad
                                   "resource://gre/modules/AddonManager.jsm");
 ChromeUtils.defineModuleGetter(this, "BrowserUtils",
                                   "resource://gre/modules/BrowserUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "DeferredTask",
                                   "resource://gre/modules/DeferredTask.jsm");
 ChromeUtils.defineModuleGetter(this, "ExtensionSettingsStore",
                                   "resource://gre/modules/ExtensionSettingsStore.jsm");
 
-XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingUiEnabled",
-                                      "browser.contentblocking.ui.enabled");
-
 const PREF_SETTING_TYPE = "prefs";
 const PROXY_KEY = "proxy.settings";
 const API_PROXY_PREFS = [
   "network.proxy.type",
   "network.proxy.http",
   "network.proxy.http_port",
   "network.proxy.share_proxy_settings",
   "network.proxy.ftp",
@@ -44,35 +41,29 @@ let extensionControlledContentIds = {
   "privacy.containers": "browserContainersExtensionContent",
   "homepage_override": "browserHomePageExtensionContent",
   "newTabURL": "browserNewTabExtensionContent",
   "webNotificationsDisabled": "browserNotificationsPermissionExtensionContent",
   "defaultSearch": "browserDefaultSearchExtensionContent",
   "proxy.settings": "proxyExtensionContent",
   get "websites.trackingProtectionMode"() {
     return {
-      button: contentBlockingUiEnabled ?
-        "contentBlockingDisableTrackingProtectionExtension" :
-        "trackingProtectionExtensionContentButton",
-      section: contentBlockingUiEnabled ?
-        "contentBlockingTrackingProtectionExtensionContentLabel" :
-        "trackingProtectionExtensionContentLabel",
+      button: "contentBlockingDisableTrackingProtectionExtension",
+      section: "contentBlockingTrackingProtectionExtensionContentLabel",
     };
   },
 };
 
 const extensionControlledL10nKeys = {
   "homepage_override": "homepage-override",
   "newTabURL": "new-tab-url",
   "webNotificationsDisabled": "web-notifications",
   "defaultSearch": "default-search",
   "privacy.containers": "privacy-containers",
-  "websites.trackingProtectionMode": contentBlockingUiEnabled ?
-                                       "websites-content-blocking-all-trackers" :
-                                       "websites-tracking-protection-mode",
+  "websites.trackingProtectionMode": "websites-content-blocking-all-trackers",
   "proxy.settings": "proxy-config",
 };
 
 let extensionControlledIds = {};
 
 /**
   * Check if a pref is being managed by an extension.
   */
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -15,19 +15,16 @@ ChromeUtils.defineModuleGetter(this, "Pl
   "resource://gre/modules/PluralForm.jsm");
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
   "resource://gre/modules/LoginHelper.jsm");
 ChromeUtils.defineModuleGetter(this, "SiteDataManager",
   "resource:///modules/SiteDataManager.jsm");
 
 ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingUiEnabled",
-                                      "browser.contentblocking.ui.enabled");
-
 XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingCookiesAndSiteDataRejectTrackersRecommended",
                                       "browser.contentblocking.cookies-site-data.ui.reject-trackers.recommended");
 
 XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingCookiesAndSiteDataRejectTrackersEnabled",
                                       "browser.contentblocking.cookies-site-data.ui.reject-trackers.enabled");
 
 XPCOMUtils.defineLazyPreferenceGetter(this, "contentBlockingFastBlockUiEnabled",
                                       "browser.contentblocking.fastblock.ui.enabled");
@@ -180,55 +177,33 @@ var gPrivacyPane = {
   _pane: null,
 
   /**
    * Whether the prompt to restart Firefox should appear when changing the autostart pref.
    */
   _shouldPromptForRestart: true,
 
   /**
-   * Initialize the tracking protection prefs and linkify its Learn More link.
-   */
-  _initTrackingProtection() {
-    setEventListener("trackingProtectionRadioGroup", "command",
-      this.trackingProtectionWritePrefs);
-    setEventListener("changeBlockList", "command", this.showBlockLists);
-
-    let link = document.getElementById("trackingProtectionLearnMore");
-    let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "tracking-protection";
-    link.setAttribute("href", url);
-  },
-
-  /**
    * Update the tracking protection UI to deal with extension control.
    */
   _updateTrackingProtectionUI() {
     let isLocked = TRACKING_PROTECTION_PREFS.some(
       pref => Services.prefs.prefIsLocked(pref));
 
     function setInputsDisabledState(isControlled) {
       let disabled = isLocked || isControlled;
-      if (contentBlockingUiEnabled) {
-        let tpCheckbox =
-          document.getElementById("contentBlockingTrackingProtectionCheckbox");
-        // Only enable the TP menu if content blocking and Detect All Trackers
-        // are enabled.
-        document.getElementById("trackingProtectionMenu").disabled = disabled ||
-          !tpCheckbox.checked ||
-          !contentBlockingEnabled;
-        // Only enable the TP category checkbox if content blocking is enabled.
-        tpCheckbox.disabled = disabled || !contentBlockingEnabled;
-      } else {
-        document.querySelectorAll("#trackingProtectionRadioGroup > radio")
-          .forEach((element) => {
-            element.disabled = disabled;
-          });
-        document.querySelector("#trackingProtectionDesc > label")
-          .disabled = disabled;
-      }
+      let tpCheckbox =
+        document.getElementById("contentBlockingTrackingProtectionCheckbox");
+      // Only enable the TP menu if content blocking and Detect All Trackers
+      // are enabled.
+      document.getElementById("trackingProtectionMenu").disabled = disabled ||
+        !tpCheckbox.checked ||
+        !contentBlockingEnabled;
+      // Only enable the TP category checkbox if content blocking is enabled.
+      tpCheckbox.disabled = disabled || !contentBlockingEnabled;
 
       // Notify observers that the TP UI has been updated.
       // This is needed since our tests need to be notified about the
       // trackingProtectionMenu element getting disabled/enabled at the right time.
       Services.obs.notifyObservers(window, "privacy-pane-tp-ui-updated");
     }
 
     if (isLocked) {
@@ -243,19 +218,17 @@ var gPrivacyPane = {
     }
   },
 
   /**
    * Set up handlers for showing and hiding controlling extension info
    * for tracking protection.
    */
   _initTrackingProtectionExtensionControl() {
-    let disableButton = contentBlockingUiEnabled ?
-      "contentBlockingDisableTrackingProtectionExtension" : "disableTrackingProtectionExtension";
-    setEventListener(disableButton, "command",
+    setEventListener("contentBlockingDisableTrackingProtectionExtension", "command",
       makeDisableControllingExtension(
         PREF_SETTING_TYPE, TRACKING_PROTECTION_KEY));
 
     let trackingProtectionObserver = {
       observe(subject, topic, data) {
         gPrivacyPane._updateTrackingProtectionUI();
       },
     };
@@ -287,23 +260,18 @@ var gPrivacyPane = {
     this.initializeHistoryMode();
     this.initAutoplay();
     this.updateAutoplayMediaControlsVisibility();
     this.updateHistoryModePane();
     this.updatePrivacyMicroControls();
     this.initAutoStartPrivateBrowsingReverter();
     this._initAutocomplete();
 
-    /* Initialize Content Blocking / Tracking Protection */
-
-    if (contentBlockingUiEnabled) {
-      this.initContentBlocking();
-    } else {
-      this._initTrackingProtection();
-    }
+    /* Initialize Content Blocking */
+    this.initContentBlocking();
 
     this.trackingProtectionReadPrefs();
     this.networkCookieBehaviorReadPrefs();
     this._initTrackingProtectionExtensionControl();
 
     this.updateContentBlockingVisibility();
 
     Preferences.get("privacy.trackingprotection.enabled").on("change",
@@ -562,48 +530,23 @@ var gPrivacyPane = {
   /**
    * Highlights the Cookies & Site Data UI section.
    */
   changeCookieSettings() {
     gotoPref("privacy-sitedata");
   },
 
   /**
-   * Changes the visibility of elements in the TP/CB section depending on the
-   * content blocking UI pref.
+   * Changes the visibility of elements in the CB section depending on the
+   * content blocking UI prefs.
    */
   updateContentBlockingVisibility() {
-    // First, update the content blocking UI.
-    let visibleState = {
-      "contentBlockingHeader": true,
-      "contentBlockingDescription": true,
-      "contentBlockingLearnMore": true,
-      "contentBlockingRestoreDefaults": true,
-      "contentBlockingCheckboxContainer": true,
-      "contentBlockingCategories": true,
-
-      "trackingProtectionHeader": false,
-      "trackingProtectionDescription": false,
-      "trackingProtectionBox": false,
-    };
-    for (let id in visibleState) {
-      document.getElementById(id).hidden = contentBlockingUiEnabled != visibleState[id];
-    }
-
-    if (contentBlockingUiEnabled) {
-      // Update the Do Not Track section to not mention "Tracking Protection".
-      let dntDefaultRadioItem =
-        document.querySelector("#doNotTrackRadioGroup > radio[value=false]");
-      document.l10n.setAttributes(
-        dntDefaultRadioItem, "do-not-track-option-default-content-blocking");
-
-      // Potentially hide the global toggle.
-      document.getElementById("contentBlockingCheckboxContainer").hidden =
-        !Services.prefs.getBoolPref("browser.contentblocking.global-toggle.enabled", true);
-    }
+    // Potentially hide the global toggle.
+    document.getElementById("contentBlockingCheckboxContainer").hidden =
+      !Services.prefs.getBoolPref("browser.contentblocking.global-toggle.enabled", true);
 
     // Allow turning off the "(recommended)" label using a pref
     let blockCookiesFromTrackers = document.getElementById("blockCookiesFromTrackers");
     if (contentBlockingCookiesAndSiteDataRejectTrackersRecommended) {
       document.l10n.setAttributes(blockCookiesFromTrackers, "sitedata-block-trackers-option-recommended");
     }
 
     // Allow hiding the Reject Trackers option based on a pref
@@ -683,33 +626,25 @@ var gPrivacyPane = {
 
   /**
    * Selects the right item of the Tracking Protection radiogroup.
    */
   trackingProtectionReadPrefs() {
     let enabledPref = Preferences.get("privacy.trackingprotection.enabled");
     let pbmPref = Preferences.get("privacy.trackingprotection.pbmode.enabled");
     let btpmPref = Preferences.get("browser.privacy.trackingprotection.menu");
-    let tpControl,
-        tpCheckbox;
-    if (contentBlockingUiEnabled) {
-      tpControl = document.getElementById("trackingProtectionMenu");
-      tpCheckbox = document.getElementById("contentBlockingTrackingProtectionCheckbox");
-    } else {
-      tpControl = document.getElementById("trackingProtectionRadioGroup");
-    }
+    let tpControl = document.getElementById("trackingProtectionMenu");
+    let tpCheckbox = document.getElementById("contentBlockingTrackingProtectionCheckbox");
 
     let savedMenuValue;
-    if (contentBlockingUiEnabled) {
-      // Only look at the backup pref when restoring the checkbox next to
-      // "All Detected Trackers".
-      if (["always", "private"].includes(btpmPref.value) &&
-          tpCheckbox.checked) {
-        savedMenuValue = btpmPref.value;
-      }
+    // Only look at the backup pref when restoring the checkbox next to
+    // "All Detected Trackers".
+    if (["always", "private"].includes(btpmPref.value) &&
+        tpCheckbox.checked) {
+      savedMenuValue = btpmPref.value;
     }
 
     this._updateTrackingProtectionUI();
 
     // Global enable takes precedence over enabled in Private Browsing.
     if (enabledPref.value) {
       tpControl.value = "always";
       if (tpCheckbox) {
@@ -736,17 +671,17 @@ var gPrivacyPane = {
   networkCookieBehaviorReadPrefs() {
     let behavior = Preferences.get("network.cookie.cookieBehavior").value;
     let blockCookiesCtrl = document.getElementById("blockCookies");
     let blockCookiesLabel = document.getElementById("blockCookiesLabel");
     let blockCookiesMenu = document.getElementById("blockCookiesMenu");
     let keepUntilLabel = document.getElementById("keepUntil");
     let keepUntilMenu = document.getElementById("keepCookiesUntil");
 
-    let disabledByCB = contentBlockingUiEnabled ? !contentBlockingEnabled : false;
+    let disabledByCB = !contentBlockingEnabled;
     let blockCookies = (behavior != 0);
     let cookieBehaviorLocked = Services.prefs.prefIsLocked("network.cookie.cookieBehavior");
     let blockCookiesControlsDisabled = !blockCookies || cookieBehaviorLocked || disabledByCB;
     blockCookiesLabel.disabled = blockCookiesMenu.disabled = blockCookiesControlsDisabled;
 
     let completelyBlockCookies = (behavior == 2);
     let privateBrowsing = Preferences.get("browser.privatebrowsing.autostart").value;
     let cookieExpirationLocked = Services.prefs.prefIsLocked("network.cookie.lifetimePolicy");
@@ -779,24 +714,18 @@ var gPrivacyPane = {
 
   /**
    * Sets the pref values based on the selected item of the radiogroup.
    */
   trackingProtectionWritePrefs() {
     let enabledPref = Preferences.get("privacy.trackingprotection.enabled");
     let pbmPref = Preferences.get("privacy.trackingprotection.pbmode.enabled");
     let btpmPref = Preferences.get("browser.privacy.trackingprotection.menu");
-    let tpControl,
-        tpCheckbox;
-    if (contentBlockingUiEnabled) {
-      tpControl = document.getElementById("trackingProtectionMenu");
-      tpCheckbox = document.getElementById("contentBlockingTrackingProtectionCheckbox");
-    } else {
-      tpControl = document.getElementById("trackingProtectionRadioGroup");
-    }
+    let tpControl = document.getElementById("trackingProtectionMenu");
+    let tpCheckbox = document.getElementById("contentBlockingTrackingProtectionCheckbox");
 
     let value;
     if (tpCheckbox) {
       if (tpCheckbox.checked) {
         value = tpControl.value;
         btpmPref.value = value;
       } else {
         value = "never";
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -14,25 +14,21 @@
       hidden="true"
       data-category="panePrivacy">
   <label class="header-name" flex="1" data-l10n-id="privacy-header"/>
 </hbox>
 
 <!-- Tracking / Content Blocking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" aria-describedby="contentBlockingDescription">
   <caption>
-    <label id="trackingProtectionHeader" hidden="true" data-l10n-id="tracking-header"/>
     <label id="contentBlockingHeader" data-l10n-id="content-blocking-header"/>
   </caption>
   <vbox data-subcategory="trackingprotection">
     <hbox align="start">
       <vbox flex="1">
-        <description id="trackingProtectionDescription" class="description-with-side-element" hidden="true" data-l10n-id="tracking-desc">
-          <html:a id="trackingProtectionLearnMore" data-l10n-name="learn-more" target="_blank" class="learnMore text-link"/>
-        </description>
         <description id="contentBlockingDescription" class="description-with-side-element" data-l10n-id="content-blocking-desc"></description>
         <label id="contentBlockingLearnMore" data-l10n-id="content-blocking-learn-more" class="learnMore text-link"/>
       </vbox>
       <vbox>
         <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
         <hbox>
           <button id="contentBlockingRestoreDefaults"
                   class="accessory-button"
@@ -160,63 +156,23 @@
                        data-l10n-id="content-blocking-reject-trackers-all-third-parties-option"
                        flex="1" />
               </radiogroup>
             </vbox>
           </vbox>
         </hbox>
       </hbox>
     </vbox>
-    <hbox id="trackingProtectionBox" hidden="true">
-      <vbox flex="1">
-        <vbox>
-          <hbox id="trackingProtectionExtensionContentLabel" align="center" hidden="true">
-            <description control="disableTrackingProtectionExtension" flex="1"/>
-          </hbox>
-          <vbox>
-            <description id="trackingProtectionDesc"
-                         control="trackingProtectionRadioGroup">
-              <label data-l10n-id="tracking-mode-label"/>
-            </description>
-            <radiogroup id="trackingProtectionRadioGroup" aria-labelledby="trackingProtectionDesc">
-              <radio value="always"
-                     data-l10n-id="tracking-mode-always"/>
-              <radio value="private"
-                     data-l10n-id="tracking-mode-private"/>
-              <radio value="never"
-                     data-l10n-id="tracking-mode-never"/>
-            </radiogroup>
-          </vbox>
-        </vbox>
-      </vbox>
-      <vbox id="trackingProtectionAdvancedSettings">
-        <hbox id="trackingProtectionExtensionContentButton" hidden="true">
-          <button id="disableTrackingProtectionExtension"
-                  class="extension-controlled-button accessory-button"
-                  flex="1"
-                  data-l10n-id="disable-extension"/>
-        </hbox>
-        <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
-        <hbox>
-          <button id="changeBlockList"
-                  class="accessory-button"
-                  flex="1"
-                  data-l10n-id="tracking-change-block-list"
-                  preference="pref.privacy.disable_button.change_blocklist"
-                  search-l10n-ids="blocklist-window.title, blocklist-desc, blocklist-button-cancel.label, blocklist-button-ok.label"/>
-        </hbox>
-      </vbox>
-    </hbox>
     <vbox id="doNotTrackLearnMoreBox">
       <label><label class="tail-with-learn-more" data-l10n-id="do-not-track-description" id="doNotTrackDesc"></label><label
       class="learnMore text-link" href="https://www.mozilla.org/dnt"
       data-l10n-id="do-not-track-learn-more"></label></label>
       <radiogroup id="doNotTrackRadioGroup" aria-labelledby="doNotTrackDesc" preference="privacy.donottrackheader.enabled">
         <radio value="true" data-l10n-id="do-not-track-option-always"/>
-        <radio value="false" data-l10n-id="do-not-track-option-default"/>
+        <radio value="false" data-l10n-id="do-not-track-option-default-content-blocking"/>
       </radiogroup>
     </vbox>
   </vbox>
 </groupbox>
 
 <!-- Site Data -->
 <groupbox id="siteDataGroup" data-category="panePrivacy" hidden="true" aria-describedby="totalSiteDataSize">
   <caption><label data-l10n-id="sitedata-header"/></caption>
--- a/browser/components/preferences/in-content/tests/browser_contentblocking.js
+++ b/browser/components/preferences/in-content/tests/browser_contentblocking.js
@@ -1,28 +1,26 @@
 /* eslint-env webextensions */
 
 const CB_PREF = "browser.contentblocking.enabled";
-const CB_UI_PREF = "browser.contentblocking.ui.enabled";
 const CB_FB_UI_PREF = "browser.contentblocking.fastblock.ui.enabled";
 const CB_TP_UI_PREF = "browser.contentblocking.trackingprotection.ui.enabled";
 const CB_RT_UI_PREF = "browser.contentblocking.rejecttrackers.ui.enabled";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TP_PBM_PREF = "privacy.trackingprotection.pbmode.enabled";
 const TP_LIST_PREF = "urlclassifier.trackingTable";
 const FB_PREF = "browser.fastblock.enabled";
 const NCB_PREF = "network.cookie.cookieBehavior";
 const TOGGLE_PREF = "browser.contentblocking.global-toggle.enabled";
 
 requestLongerTimeout(2);
 
 // Checks that the content blocking toggle follows and changes the CB pref.
 add_task(async function testContentBlockingToggle() {
   SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
     [TOGGLE_PREF, true],
   ]});
 
   await openPreferencesViaOpenPreferencesAPI("privacy", {leaveOpen: true});
   let doc = gBrowser.contentDocument;
 
   let contentBlockingToggle = doc.getElementById("contentBlockingToggle");
   let contentBlockingCheckbox = doc.getElementById("contentBlockingCheckbox");
@@ -55,20 +53,16 @@ add_task(async function testContentBlock
   is(contentBlockingToggle.getAttribute("aria-pressed"), "false", "toggle button has correct aria attribute");
 
   Services.prefs.clearUserPref(CB_PREF);
   gBrowser.removeCurrentTab();
 });
 
 // Tests that the content blocking main category checkboxes have the correct default state.
 add_task(async function testContentBlockingMainCategory() {
-  SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
-  ]});
-
   let prefs = [
     [CB_PREF, true],
     [FB_PREF, true],
     [TP_PREF, false],
     [TP_PBM_PREF, true],
     [NCB_PREF, Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
   ];
 
@@ -156,20 +150,16 @@ add_task(async function testContentBlock
 
   for (let pref of prefs) {
     SpecialPowers.clearUserPref(pref[0]);
   }
 });
 
 // Tests that the content blocking "Restore Defaults" button does what it's supposed to.
 add_task(async function testContentBlockingRestoreDefaults() {
-  SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
-  ]});
-
   let prefs = {
     CB_PREF: null,
     FB_PREF: null,
     TP_LIST_PREF: null,
     TP_PREF: null,
     TP_PBM_PREF: null,
     NCB_PREF: null,
   };
@@ -222,20 +212,16 @@ add_task(async function testContentBlock
   }
 
   gBrowser.removeCurrentTab();
 });
 
 // Tests that the content blocking "Restore Defaults" button does not restore prefs
 // that are controlled by extensions.
 add_task(async function testContentBlockingRestoreDefaultsSkipExtensionControlled() {
-  SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
-  ]});
-
   function background() {
     browser.privacy.websites.trackingProtectionMode.set({value: "always"});
   }
 
   // Install an extension that sets Tracking Protection.
   let extension = ExtensionTestUtils.loadExtension({
     useAddonManager: "permanent",
     manifest: {
@@ -385,17 +371,16 @@ async function doDependentControlChecks(
   gBrowser.removeCurrentTab();
 }
 
 // Checks that the granular controls are disabled or enabled depending on the master pref for CB.
 add_task(async function testContentBlockingDependentControls() {
   // In Accept All Cookies mode, the radiogroup under Third-Party Cookies is always disabled
   // since the checkbox next to Third-Party Cookies would be unchecked.
   SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
     [CB_FB_UI_PREF, true],
     [CB_TP_UI_PREF, true],
     [CB_RT_UI_PREF, true],
     [NCB_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT],
   ]});
 
   let dependentControls = [
     ".content-blocking-checkbox",
@@ -412,17 +397,16 @@ add_task(async function testContentBlock
     "#blockCookiesMenu",
   ];
 
   await doDependentControlChecks(dependentControls, alwaysDisabledControls);
 
   // In Block Cookies from Trackers (or Block Cookies from All Third-Parties) mode, the
   // radiogroup's disabled status must obey the content blocking enabled state.
   SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
     [CB_FB_UI_PREF, true],
     [CB_TP_UI_PREF, true],
     [CB_RT_UI_PREF, true],
     [NCB_PREF, Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
   ]});
 
   dependentControls = [
     ".content-blocking-checkbox",
@@ -438,17 +422,16 @@ add_task(async function testContentBlock
   ];
 
   await doDependentControlChecks(dependentControls);
 });
 
 // Checks that the controls for tracking protection are disabled when all TP prefs are off.
 add_task(async function testContentBlockingDependentTPControls() {
   SpecialPowers.pushPrefEnv({set: [
-    [CB_UI_PREF, true],
     [CB_FB_UI_PREF, true],
     [CB_TP_UI_PREF, true],
     [CB_RT_UI_PREF, true],
     [TP_PREF, false],
     [TP_PBM_PREF, false],
     [NCB_PREF, Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
   ]});
 
@@ -476,17 +459,16 @@ add_task(async function testContentBlock
 // when the Cookies and Site Data section is set to block either "All Cookies" or "Cookies from
 // unvisited websites".
 add_task(async function testContentBlockingDependentControlsOnSiteDataUI() {
   let prefValuesToTest = [
     Ci.nsICookieService.BEHAVIOR_REJECT,        // Block All Cookies
   ];
   for (let value of prefValuesToTest) {
     await SpecialPowers.pushPrefEnv({set: [
-      [CB_UI_PREF, true],
       [CB_FB_UI_PREF, true],
       [CB_TP_UI_PREF, true],
       [CB_RT_UI_PREF, true],
       [TP_PREF, false],
       [TP_PBM_PREF, true],
       [NCB_PREF, value],
     ]});
 
@@ -520,17 +502,16 @@ add_task(async function testContentBlock
 
   // When Block Cookies from unvisited websites is selected, the Third-Party Cookies section under
   // Content Blocking should get disabled unconditionally.
   prefValuesToTest = [
     Ci.nsICookieService.BEHAVIOR_LIMIT_FOREIGN, // Block Cookies from unvisited websites
   ];
   for (let value of prefValuesToTest) {
     await SpecialPowers.pushPrefEnv({set: [
-      [CB_UI_PREF, true],
       [CB_FB_UI_PREF, true],
       [CB_TP_UI_PREF, true],
       [CB_RT_UI_PREF, true],
       [TP_PREF, false],
       [TP_PBM_PREF, true],
       [NCB_PREF, value],
     ]});
 
@@ -562,17 +543,16 @@ add_task(async function testContentBlock
   // When Accept All Cookies is selected, the radio buttons under Third-Party Cookies
   // in Content Blocking as well as the Type blocked controls in Cookies and Site Data
   // must remain disabled unconditionally.
   prefValuesToTest = [
     Ci.nsICookieService.BEHAVIOR_ACCEPT,         // Accept All Cookies
   ];
   for (let value of prefValuesToTest) {
     await SpecialPowers.pushPrefEnv({set: [
-      [CB_UI_PREF, true],
       [CB_FB_UI_PREF, true],
       [CB_TP_UI_PREF, true],
       [CB_RT_UI_PREF, true],
       [TP_PREF, false],
       [TP_PBM_PREF, true],
       [NCB_PREF, value],
     ]});
 
@@ -599,17 +579,16 @@ add_task(async function testContentBlock
   // For other choices of cookie policies, no parts of the UI should get disabled
   // unconditionally.
   prefValuesToTest = [
     Ci.nsICookieService.BEHAVIOR_REJECT_FOREIGN, // Block All Third-Party Cookies
     Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER, // Block Cookies from third-party trackers
   ];
   for (let value of prefValuesToTest) {
     await SpecialPowers.pushPrefEnv({set: [
-      [CB_UI_PREF, true],
       [CB_FB_UI_PREF, true],
       [CB_TP_UI_PREF, true],
       [CB_RT_UI_PREF, true],
       [TP_PREF, false],
       [TP_PBM_PREF, true],
       [NCB_PREF, value],
     ]});
 
@@ -633,17 +612,16 @@ add_task(async function testContentBlock
 });
 
 
 // Checks that the warnings in the Content Blocking Third-Party Cookies section correctly appear based on
 // the selections in the Cookies and Site Data section.
 add_task(async function testContentBlockingThirdPartyCookiesWarning() {
   await SpecialPowers.pushPrefEnv({set: [
     [CB_PREF, true],
-    [CB_UI_PREF, true],
     [CB_FB_UI_PREF, true],
     [CB_TP_UI_PREF, true],
     [CB_RT_UI_PREF, true],
   ]});
 
   let expectedDeckIndex = new Map([
     [Ci.nsICookieService.BEHAVIOR_ACCEPT, 0],
     [Ci.nsICookieService.BEHAVIOR_REJECT_FOREIGN, 0],
--- a/browser/components/preferences/in-content/tests/browser_extension_controlled.js
+++ b/browser/components/preferences/in-content/tests/browser_extension_controlled.js
@@ -583,79 +583,58 @@ add_task(async function testExtensionCon
   // Don't finalize the current store since it will write out the bad data.
   await ExtensionSettingsStore._reloadFile(false);
 
   is(ExtensionSettingsStore.getSetting("prefs", "homepage_override"), null,
      "The ExtensionSettingsStore is left empty.");
 });
 
 add_task(async function testExtensionControlledTrackingProtection() {
-  const CB_UI_PREF = "browser.contentblocking.ui.enabled";
   const TP_PREF = "privacy.trackingprotection.enabled";
   const TP_DEFAULT = false;
   const EXTENSION_ID = "@set_tp";
-  const CONTROLLED_LABEL_ID = {
-    old: "trackingProtectionExtensionContentLabel",
-    new: "contentBlockingTrackingProtectionExtensionContentLabel",
-  };
-  const CONTROLLED_BUTTON_ID = {
-    old: "trackingProtectionExtensionContentButton",
-    new: "contentBlockingDisableTrackingProtectionExtension",
-  };
-  const DISABLE_BUTTON_ID = {
-    old: "disableTrackingProtectionExtension",
-    new: "contentBlockingDisableTrackingProtectionExtension",
-  };
+  const CONTROLLED_LABEL_ID = "contentBlockingTrackingProtectionExtensionContentLabel";
+  const CONTROLLED_BUTTON_ID = "contentBlockingDisableTrackingProtectionExtension";
+  const DISABLE_BUTTON_ID = "contentBlockingDisableTrackingProtectionExtension";
 
   let tpEnabledPref = () => Services.prefs.getBoolPref(TP_PREF);
-  let cbUIEnabledPref = () => Services.prefs.getBoolPref(CB_UI_PREF);
 
   await SpecialPowers.pushPrefEnv(
-    {"set": [[TP_PREF, TP_DEFAULT], [CB_UI_PREF, true]]});
+    {"set": [[TP_PREF, TP_DEFAULT]]});
 
   function background() {
     browser.privacy.websites.trackingProtectionMode.set({value: "always"});
   }
 
   function verifyState(isControlled) {
     is(tpEnabledPref(), isControlled, "TP pref is set to the expected value.");
 
-    let controlledLabel = doc.getElementById(CONTROLLED_LABEL_ID[uiType]);
-    let controlledButton = doc.getElementById(CONTROLLED_BUTTON_ID[uiType]);
+    let controlledLabel = doc.getElementById(CONTROLLED_LABEL_ID);
+    let controlledButton = doc.getElementById(CONTROLLED_BUTTON_ID);
 
     is(controlledLabel.hidden, !isControlled, "The extension controlled row's visibility is as expected.");
     is(controlledButton.hidden, !isControlled, "The disable extension button's visibility is as expected.");
     if (isControlled) {
       let controlledDesc = controlledLabel.querySelector("description");
       Assert.deepEqual(doc.l10n.getAttributes(controlledDesc), {
-        id: cbUIEnabledPref() ? "extension-controlled-websites-content-blocking-all-trackers" :
-                                "extension-controlled-websites-tracking-protection-mode",
+        id: "extension-controlled-websites-content-blocking-all-trackers",
         args: {
           name: "set_tp",
         },
       }, "The user is notified that an extension is controlling TP.");
     }
 
-    if (uiType === "old") {
-      for (let element of doc.querySelectorAll("#trackingProtectionRadioGroup > radio")) {
-        is(element.disabled, isControlled, "TP controls are enabled.");
-      }
-      is(doc.querySelector("#trackingProtectionDesc > label").disabled,
-         isControlled,
-         "TP control label is enabled.");
-    } else {
-      is(doc.getElementById("trackingProtectionMenu").disabled,
-         isControlled,
-         "TP control is enabled.");
-    }
+    is(doc.getElementById("trackingProtectionMenu").disabled,
+       isControlled,
+       "TP control is enabled.");
   }
 
   async function disableViaClick() {
-    let labelId = CONTROLLED_LABEL_ID[uiType];
-    let disableId = DISABLE_BUTTON_ID[uiType];
+    let labelId = CONTROLLED_LABEL_ID;
+    let disableId = DISABLE_BUTTON_ID;
     let controlledLabel = doc.getElementById(labelId);
 
     let enableMessageShown = waitForEnableMessage(labelId);
     doc.getElementById(disableId).click();
     await enableMessageShown;
 
     // The user is notified how to enable the extension.
     let controlledDesc = controlledLabel.querySelector("description");
@@ -665,23 +644,21 @@ add_task(async function testExtensionCon
 
     // The user can dismiss the enable instructions.
     let hidden = waitForMessageHidden(labelId);
     controlledLabel.querySelector("image:last-of-type").click();
     await hidden;
   }
 
   async function reEnableExtension(addon) {
-    let controlledMessageShown = waitForMessageShown(CONTROLLED_LABEL_ID[uiType]);
+    let controlledMessageShown = waitForMessageShown(CONTROLLED_LABEL_ID);
     await addon.enable();
     await controlledMessageShown;
   }
 
-  let uiType = "new";
-
   await openPreferencesViaOpenPreferencesAPI("panePrivacy", {leaveOpen: true});
   let doc = gBrowser.contentDocument;
 
   is(gBrowser.currentURI.spec, "about:preferences#privacy",
    "#privacy should be in the URI for about:preferences");
 
   verifyState(false);
 
@@ -691,48 +668,27 @@ add_task(async function testExtensionCon
     manifest: {
       name: "set_tp",
       applications: {gecko: {id: EXTENSION_ID}},
       permissions: ["privacy"],
     },
     background,
   });
 
-  let messageShown = waitForMessageShown(CONTROLLED_LABEL_ID[uiType]);
+  let messageShown = waitForMessageShown(CONTROLLED_LABEL_ID);
   await extension.startup();
   await messageShown;
   let addon = await AddonManager.getAddonByID(EXTENSION_ID);
 
   verifyState(true);
 
   await disableViaClick();
 
   verifyState(false);
 
-  // Switch to the "old" Tracking Protection UI.
-  uiType = "old";
-  Services.prefs.setBoolPref(CB_UI_PREF, false);
-
-  let browserLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, "about:preferences#privacy");
-  gBrowser.selectedBrowser.reload();
-  await browserLoaded;
-  is(gBrowser.currentURI.spec, "about:preferences#privacy",
-   "#privacy should be in the URI for about:preferences");
-  doc = gBrowser.contentDocument;
-
-  verifyState(false);
-
-  await reEnableExtension(addon);
-
-  verifyState(true);
-
-  await disableViaClick();
-
-  verifyState(false);
-
   // Enable the extension so we get the UNINSTALL event, which is needed by
   // ExtensionPreferencesManager to clean up properly.
   // TODO: BUG 1408226
   await reEnableExtension(addon);
 
   await extension.unload();
 
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
--- a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_6.js
+++ b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_6.js
@@ -13,25 +13,16 @@ add_task(async function() {
  * Test for searching for the "Block Lists" subdialog.
  */
 add_task(async function() {
   async function doTest() {
     await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
     await evaluateSearchResults("block Web elements", "trackingGroup");
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
-  await SpecialPowers.pushPrefEnv({"set": [
-    ["browser.contentblocking.ui.enabled", true],
-  ]});
-  info("Run the test with Content Blocking UI enabled");
-  await doTest();
-  await SpecialPowers.pushPrefEnv({"set": [
-    ["browser.contentblocking.ui.enabled", false],
-  ]});
-  info("Run the test with Content Blocking UI disabled");
   await doTest();
 });
 
 /**
  * Test for searching for the "Allowed Sites - Pop-ups" subdialog.
  */
 add_task(async function() {
   await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
--- a/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_site_data.js
+++ b/browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_site_data.js
@@ -2,53 +2,16 @@
 * This file contains tests for the Preferences search bar.
 */
 
 // Enabling Searching functionatily. Will display search bar form this testcase forward.
 add_task(async function() {
   await SpecialPowers.pushPrefEnv({"set": [["browser.preferences.search", true]]});
 });
 
-// First, run the tests without the Content Blocking UI.
-add_task(async function() {
-  await SpecialPowers.pushPrefEnv({"set": [["browser.contentblocking.ui.enabled", false]]});
-});
-
-/**
- * Test for searching for the "Settings - Site Data" subdialog.
- */
-add_task(async function() {
-  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
-  await evaluateSearchResults("cookies", ["siteDataGroup"]);
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
-
-add_task(async function() {
-  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
-  await evaluateSearchResults("site data", ["siteDataGroup"]);
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
-
-add_task(async function() {
-  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
-  await evaluateSearchResults("cache", ["siteDataGroup"]);
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
-
-add_task(async function() {
-  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
-  await evaluateSearchResults("third-party", "siteDataGroup");
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-});
-
-// Now, run the tests with the Content Blocking UI.
-add_task(async function() {
-  await SpecialPowers.pushPrefEnv({"set": [["browser.contentblocking.ui.enabled", true]]});
-});
-
 /**
  * Test for searching for the "Settings - Site Data" subdialog.
  */
 add_task(async function() {
   await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
   await evaluateSearchResults("cookies", ["siteDataGroup", "trackingGroup"]);
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
--- a/browser/components/preferences/in-content/tests/browser_spotlight.js
+++ b/browser/components/preferences/in-content/tests/browser_spotlight.js
@@ -48,17 +48,16 @@ add_task(async function test_form_autofi
   is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "form-autofill",
     "The form-autofill section is spotlighted.");
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
 
 add_task(async function test_change_cookie_settings() {
   await SpecialPowers.pushPrefEnv({set: [
     ["browser.contentblocking.enabled", true],
-    ["browser.contentblocking.ui.enabled", true],
     ["browser.contentblocking.fastblock.ui.enabled", true],
     ["browser.contentblocking.trackingprotection.ui.enabled", true],
     ["browser.contentblocking.rejecttrackers.ui.enabled", true],
   ]});
   let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-trackingprotection", {leaveOpen: true});
   is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
   let doc = gBrowser.contentDocument;
   is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js
@@ -1,49 +1,28 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* eslint-env mozilla/frame-script */
 
 const CB_ENABLED_PREF = "browser.contentblocking.enabled";
-const CB_UI_ENABLED_PREF = "browser.contentblocking.ui.enabled";
 const TP_ENABLED_PREF = "privacy.trackingprotection.enabled";
 const TP_PB_ENABLED_PREF = "privacy.trackingprotection.pbmode.enabled";
 
-let contentBlockingUIEnabled = false;
-
 function updateTPInfo() {
   let tpButton = document.getElementById("tpButton");
   let tpToggle = document.getElementById("tpToggle");
-  let title = document.getElementById("title");
-  let titleTracking = document.getElementById("titleTracking");
   let tpSubHeader = document.getElementById("tpSubHeader");
 
-  let tpTitle = document.getElementById("tpTitle");
-  let cbTitle = document.getElementById("cbTitle");
-  let tpDescription = document.getElementById("tpDescription");
-  let cbDescription = document.getElementById("cbDescription");
-
-  tpTitle.toggleAttribute("hidden", contentBlockingUIEnabled);
-  tpDescription.toggleAttribute("hidden", contentBlockingUIEnabled);
-
-  cbTitle.toggleAttribute("hidden", !contentBlockingUIEnabled);
-  cbDescription.toggleAttribute("hidden", !contentBlockingUIEnabled);
-
   let globalTrackingEnabled = RPMGetBoolPref(TP_ENABLED_PREF);
   let trackingEnabled = globalTrackingEnabled || RPMGetBoolPref(TP_PB_ENABLED_PREF);
 
-  if (contentBlockingUIEnabled) {
-    let contentBlockingEnabled = RPMGetBoolPref(CB_ENABLED_PREF);
-    trackingEnabled = trackingEnabled && contentBlockingEnabled;
-  } else {
-    title.toggleAttribute("hidden", trackingEnabled);
-    titleTracking.toggleAttribute("hidden", !trackingEnabled);