Fixup

Update correct versions for .150
Some adjustments for install deps failures
2018-01-30 12:34:36 +01:00 · 2018-01-30 01:06:09 +01:00 · 2018-01-28 14:31:44 +01:00 · 2018-01-28 13:36:52 +01:00 · 2018-01-28 13:36:34 +01:00
88 changed files with 44938 additions and 112277 deletions
@@ -1,35 +0,0 @@
---
-name: Bug report
-about: Create a Bromite bug report
-
---
-
-**Version**
-
-Version: `v67...`
-Arch: `arm` or `arm64` or `x86`
-
-**Is the bug reproducible with latest version?**
-`Bug must be reproducible with latest version`
-
-**Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
-`Bug must NOT be reproducible with Chromium to be qualified as a Bromite bug`
-
-**Is the bug a crash?**
-If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
@@ -1,17 +0,0 @@
---
-name: Feature request
-about: Suggest a privacy-related idea for this project
-
---
-
-**Is your feature request related to privacy?**
-Only privacy-related feature requests are considered.
-
-**Is there a patch available for this feature somewhere?**
-...
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
@@ -1,125 +1,3 @@
-# 67.0.3396.95
-* reduce headers sent in DoH requests (fixes https://github.com/bromite/bromite/issues/70)
-* serve DoH requests with maximum priority
-* `CloudFlare` -> `Cloudflare` (fixes https://github.com/bromite/bromite/issues/73)
-* fingerprint miitagions: cover also `ConvertToArrayBufferContents`
-* updated AdBlock filters
-
-# 67.0.3396.92
-* improve randomisation for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
-* updated AdBlock filters
-
-# 67.0.3396.88
-* add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68)
-* disable signin, translate and data saver UI/internal components (fixes https://github.com/bromite/bromite/issues/67)
-* rename `GoogleEN` -> `Google In English` (fixes https://github.com/bromite/bromite/issues/66)
-* re-enabled text metrics and ToDataURL, ToBlob with randomisation of color data (fixes https://github.com/bromite/bromite/issues/52)
-* open YouTube links in Bromite
-* use Android Media Player for URLs
-* add exit menu item
-* hide "send reports to Google" menu item
-* updated AdBlock filters
-
-# 67.0.3396.82
-* updated AdBlock filters
-
-# 67.0.3396.76
-* updated AdBlock filters
-
-# 67.0.3396.72
-* add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53)
-* updated AdBlock filters
-
-# 67.0.3396.67
-* updated AdBlock filters
-
-# 66.0.3359.202
-* fix DevTools integration (https://github.com/bromite/bromite/issues/23)
-* allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60)
-* updated AdBlock filters
-
-# 66.0.3359.200
-* updated AdBlock filters
-
-# 66.0.3359.196
-* updated AdBlock filters
-
-# 66.0.3359.188
-* updated AdBlock filters
-* increase max (persistent) connections per server from 6 to 15
-* preliminary work for better canvas fingerprinting mitigations
-
-# 66.0.3359.161
-* updated AdBlock filters
-
-# 66.0.3359.148
-* disable permanently all custom tab intents (https://github.com/bromite/bromite/issues/17)
-* updated AdBlock filters
-* reduce randomisation for client rects from 5% to 3%
-
-# 65.0.3325.230
-* fixed permission to access Google account issue (https://github.com/bromite/bromite/issues/11)
-* updated AdBlock filters
-
-# 65.0.3325.218
-* always set WideVine version
-* updated AdBlock filters
-
-# 65.0.3325.204
-* add menu option to toggle global Javascript preferences setting (https://github.com/bromite/bromite/issues/37)
-* add fingeprinting mitigation for getClientRects, getBoundingClientRect
-* set audio latency to fixed number
-* updated AdBlock filters
-
-# 65.0.3325.198
-* re-landed support for third-party AdBlock filters
-* completed patches cleanup
-* updated AdBlock filters
-
-# 65.0.3325.190
-* block some Canvas and AudioBuffer APIs mostly used for fingerprinting (https://github.com/bromite/bromite/issues/15)
-* updated AdBlock filters
-
-# 65.0.3325.176
-* block plugins enumeration API
-* block battery API
-* remove device name and build id from User Agent
-* added Qwant search engine
-* updated AdBlock filters
-* disable non-working 3rd-party filters support
-
-# 64.0.3282.204
-* use H264 NEON optimizations also for arm64
-* fix build of Stable channel
-* updated AdBlock filters
-* started building vanilla Chromium releases as well
-
-# 64.0.3282.193
-* updated AdBlock filters
-* disable reporting
-
-# 64.0.3282.182
-* add support for domain-based adblock filters
-* optimized memory allocation for filters
-* updated AdBlock filters
-
-# 64.0.3282.168
-* extension: allow playing youtube/vimeo videos in background (https://github.com/bromite/bromite/issues/16)
-* never fetch most popular sites for new tab initialization, disable logo on new tab page
-* some improvements to adblock filters
-* disabled signin (ungoogled-chromium) (https://github.com/bromite/bromite/issues/31 and https://github.com/bromite/bromite/issues/11)
-* disabled webRTC and crash uploaders (ungoogled-chromium)
-* disabled translate (ungoogled-chromium)
-* disabled Gaia & GCM (ungoogled-chromium)
-* added clear HTTP cache menu item (ungoogled-chromium)
-* disabled Google host detection (ungoogled-chromium)
-* disabled profile avatar downloading (ungoogled-chromium)
-* disabled intranet redirect detector (ungoogled-chromium)
-* disabled plugin untraceable URLs (ungoogled-chromium)
-
-# 64.0.3282.149
-* updated AdBlock filters
-
 # 63.0.3239.150
 * fixed crash when clicking on address bar lock (page info) or opening site settings (https://github.com/bromite/bromite/issues/28)
 * build H264 with NEON optimizations for ARMv7
@@ -1,6 +1,6 @@
 # Bromite - Take back your browser

-<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> [![license][license-image]][license-url]
+[![GitHub release][version-image]][version-url] [![license][license-image]][license-url]

 <img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />

@@ -10,19 +10,10 @@ Bromite is only available for Android v4.1 and above.

 See [open issues](https://github.com/bromite/bromite/issues) for the development in progress.

-<img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" /> <img src="https://www.bromite.org/bromite_bromite_xda_downloads.svg" alt="downloads on XDA Labs" title="downloads on XDA Labs" />
-
-# Goals
-
-Bromite aims at providing a no-clutter browsing experience without privacy-invasive features and with the addition of a fast ad-blocking engine.
-Minimal UI changes are applied to help curbing the idea of "browser as an advertisement platform".
-
 # Donate

 Please donate to support development of Bromite and the costs for the build system.

-[Donate via LiberaPay](https://liberapay.com/csagan5/donate)
-
 Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)

 Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)
@@ -31,56 +22,31 @@ BTC donations address: `3MkC3idL61npQSCxL1gceksmRTkNkiCPcG`

 ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

+# Features
+
+* adblocking (currently baked-in, no configuration options available)
+* remove click-tracking and AMP from Google search results
+* [StartPage](https://startpage.com/) search engine (select it from search engines under settings)
+* [DuckDuckGo](https://duckduckgo.com/) search engine (select it from search engines under settings)
+* privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
+* all codecs included (proprietary, open H.264 etc.)
+* built with official Chrome optimizations
+
 # F.A.Q.

-## Does Google Sync/Translate/Data saver work?
+## Does Google Sync work?
 No.
 This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.

-## Does Bromite require root?
-No.
-
-## What is the SystemWebView?
-It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
-
-## How to enable DNS-over-HTTPS?
-
-See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
-
-## Can you add dark mode/some cool themes?
-No.
-Bromite is about adblocking and privacy.
-
-## Can you add HTTPS everywhere?
-No.
-We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywhere in particular is too invasive to be easily maintained across new releases.
-
-# Features
-
-* baked-in adblock engine with filters from EasyList, EasyPrivacy and others
-* remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google/CloudFlare servers
-* allow playing videos in background
-* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
-* privacy enhancement patches from [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/), [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) and [Iridium](https://github.com/iridium-browser) projects
-* webRTC, canvas, audio and other anti-fingerprinting mitigations
-* all codecs included (proprietary, open H.264 etc.)
-* built with official speed optimizations
-
-You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches
-
 # Releases

-All built versions are available as [releases](https://github.com/bromite/bromite/releases).
+A build server goes through the very lengthy build operation and then new versions are available in this project as [releases](https://github.com/bromite/bromite/releases).

 Each tag corresponds to a Chromium release tag.

-Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
-Additionally, SystemWebView, Monochrome and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
-
 # How to build

-The [Bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).
+The [bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).

 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.

@@ -90,9 +56,8 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) for some patches
 * [Iridium project](https://github.com/iridium-browser) for some patches (taken from above ungoogled-chromium)
 * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (taken from above ungoogled-chromium)
-* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
 * nochromo for the original adblock patch
-* [AdBlock Plus](https://adblockplus.org/), [uBlock](https://www.ublock.org/), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included
+* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the compilation of original adblock patch

 # License

@@ -0,0 +1,27 @@
+
+## is_official_build enables some optimizations
+target_os="android" symbol_level=1 remove_webcore_debug_symbols=true is_debug=false is_official_build=true use_errorprone_java_compiler=false
+
+## codec settings
+enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
+enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true enable_widevine=true
+use_openh264=true chrome_pgo_phase=0 full_wpo_on_official=true
+
+## disable some features that don't work anymore/undesired
+enable_google_now=false
+enable_webrtc=false
+use_official_google_api_keys=false
+enable_nacl=false
+
+android_channel="stable"
+
+enable_resource_whitelist_generation=false
+use_sysroot=false
+
+## reduce from the default of 50 since the build box has limited resources
+jumbo_file_merge_limit=30
+
+## signing is deletegated to F-Droid
+#android_keystore_path="//build/android/bromite.keystore"
+#android_keystore_name = "bromitekey"
+#android_keystore_password = "bromite"
@@ -0,0 +1,63 @@
+#!/bin/bash
+## build.sh
+##
+## @author csagan5
+##
+## Bromite build script for F-Droid
+## https://www.bromite.org/
+##
+#
+
+if [ ! $# -eq 5 ]; then
+	echo "Usage: build.sh release version-code arch ninja-target" 1>&2
+	exit 1
+fi
+
+RELEASE="$1"
+VER_CODE="$2"
+ARCH="$3"
+NINJA_TARGET="$4"
+
+OUTPUT="out/Release_${RELEASE}_${ARCH}"
+
+set -e
+
+## build= commands run in fdroiddata/build/$PKG
+
+. common
+
+cd ../..
+
+## create output directory - preserve if exists but make sure it's a symlink within srclibs/src
+mkdir -p "$OUTPUT"
+if [ -e srclib/src/out ]; then
+        unlink srclib/src/out
+fi
+ln -s "$PWD/out" srclib/src/out
+
+## from base/build_time.cc
+# BUILD_DATE is exactly "Mmm DD YYYY HH:MM:SS".
+# See //build/write_build_date_header.py. "HH:MM:SS" is normally expected to
+# be "05:00:00"
+BDATE="$(date +'%b %d %Y') 05:00:00"
+
+## read all arguments from file, skip comments
+GN_ARGS="$(sed 's~ *#.*$~~' $PKG/fdroid/GN_ARGS | grep -v ^$ | tr '\n' ' ')"
+
+cd srclib/src
+
+gn gen "--args=android_default_version_code=\"${VER_CODE}\" android_default_version_name=\"$RELEASE\" override_build_date=\"$BDATE\" target_cpu=\"$ARCH\" $GN_ARGS" "$OUTPUT"
+
+## concurrency level for ninja
+CONC=$(nproc)
+let CONC+=1
+
+PREFIX=""
+## detect running buildserver
+## if running locally, then reduce build process priority
+if [ ! -e $HOME/buildserverid ]; then
+	PREFIX="ionice --class 3 nice --adjustment=5"
+fi
+
+##NOTE: can't use exit code to identify interrupts until https://github.com/ninja-build/ninja/issues/430 is addressed
+NINJA_STATUS="%f/%t (%p) %es | " $PREFIX ninja -j$CONC -C "$OUTPUT" ${NINJA_TARGET}
@@ -0,0 +1,12 @@
+###
+### common include script for sync and build
+###
+
+## rename main repo & restore it on exit
+mv ../../srclib/chromium ../../srclib/src
+trap "mv '$PWD/../../srclib/src' '$PWD/../../srclib/chromium'" EXIT
+
+export DEPOT_TOOLS="$PWD/../../srclib/DepotTools"
+export PATH="$DEPOT_TOOLS:$PATH"
+
+PKG=org.bromite.bromite
@@ -0,0 +1,738 @@
+#!/bin/bash
+## gclient-prepare.sh
+##
+## @author csagan5
+##
+## Bromite srclibs setup script for F-Droid build
+## this script is auto-generated based on gclient_entries
+## DO NOT edit manually
+##
+## https://www.bromite.org/
+##
+#
+
+set -e
+
+## setup chromium-py into src/third_party/webdriver/pylib
+mkdir -p "src/third_party/webdriver"
+if [ -e "src/third_party/webdriver/pylib" ]; then
+	rm -rfv "src/third_party/webdriver/pylib"
+fi
+ln -v -s "$PWD/chromium-py" "src/third_party/webdriver/pylib"
+
+## setup chromium-v8 into src/v8
+mkdir -p "src"
+if [ -e "src/v8" ]; then
+	rm -rfv "src/v8"
+fi
+ln -v -s "$PWD/chromium-v8" "src/v8"
+
+## setup chromium-aom into src/third_party/libaom/source/libaom
+mkdir -p "src/third_party/libaom/source"
+if [ -e "src/third_party/libaom/source/libaom" ]; then
+	rm -rfv "src/third_party/libaom/source/libaom"
+fi
+ln -v -s "$PWD/chromium-aom" "src/third_party/libaom/source/libaom"
+
+## setup chromium-cdm into src/media/cdm/api
+mkdir -p "src/media/cdm"
+if [ -e "src/media/cdm/api" ]; then
+	rm -rfv "src/media/cdm/api"
+fi
+ln -v -s "$PWD/chromium-cdm" "src/media/cdm/api"
+
+## setup chromium-gyp into src/tools/gyp
+mkdir -p "src/tools"
+if [ -e "src/tools/gyp" ]; then
+	rm -rfv "src/tools/gyp"
+fi
+ln -v -s "$PWD/chromium-gyp" "src/tools/gyp"
+
+## setup chromium-icu into src/third_party/icu
+mkdir -p "src/third_party"
+if [ -e "src/third_party/icu" ]; then
+	rm -rfv "src/third_party/icu"
+fi
+ln -v -s "$PWD/chromium-icu" "src/third_party/icu"
+
+## setup chromium-lib into src/third_party/bidichecker
+if [ -e "src/third_party/bidichecker" ]; then
+	rm -rfv "src/third_party/bidichecker"
+fi
+ln -v -s "$PWD/chromium-lib" "src/third_party/bidichecker"
+
+## setup chromium-re2 into src/third_party/re2/src
+mkdir -p "src/third_party/re2"
+if [ -e "src/third_party/re2/src" ]; then
+	rm -rfv "src/third_party/re2/src"
+fi
+ln -v -s "$PWD/chromium-re2" "src/third_party/re2/src"
+
+## setup chromium-wds into src/third_party/wds/src
+mkdir -p "src/third_party/wds"
+if [ -e "src/third_party/wds/src" ]; then
+	rm -rfv "src/third_party/wds/src"
+fi
+ln -v -s "$PWD/chromium-wds" "src/third_party/wds/src"
+
+## setup chromium-auto into src/third_party/auto/src
+mkdir -p "src/third_party/auto"
+if [ -e "src/third_party/auto/src" ]; then
+	rm -rfv "src/third_party/auto/src"
+fi
+ln -v -s "$PWD/chromium-auto" "src/third_party/auto/src"
+
+## setup chromium-deqp into src/third_party/deqp/src
+mkdir -p "src/third_party/deqp"
+if [ -e "src/third_party/deqp/src" ]; then
+	rm -rfv "src/third_party/deqp/src"
+fi
+ln -v -s "$PWD/chromium-deqp" "src/third_party/deqp/src"
+
+## setup chromium-dist into src/third_party/dom_distiller_js/dist
+mkdir -p "src/third_party/dom_distiller_js"
+if [ -e "src/third_party/dom_distiller_js/dist" ]; then
+	rm -rfv "src/third_party/dom_distiller_js/dist"
+fi
+ln -v -s "$PWD/chromium-dist" "src/third_party/dom_distiller_js/dist"
+
+## setup chromium-flac into src/third_party/flac
+if [ -e "src/third_party/flac" ]; then
+	rm -rfv "src/third_party/flac"
+fi
+ln -v -s "$PWD/chromium-flac" "src/third_party/flac"
+
+## setup chromium-mesa into src/third_party/mesa/src
+mkdir -p "src/third_party/mesa"
+if [ -e "src/third_party/mesa/src" ]; then
+	rm -rfv "src/third_party/mesa/src"
+fi
+ln -v -s "$PWD/chromium-mesa" "src/third_party/mesa/src"
+
+## setup chromium-skia into src/third_party/skia
+if [ -e "src/third_party/skia" ]; then
+	rm -rfv "src/third_party/skia"
+fi
+ln -v -s "$PWD/chromium-skia" "src/third_party/skia"
+
+## setup chromium-acid3 into src/tools/page_cycler/acid3
+mkdir -p "src/tools/page_cycler"
+if [ -e "src/tools/page_cycler/acid3" ]; then
+	rm -rfv "src/tools/page_cycler/acid3"
+fi
+ln -v -s "$PWD/chromium-acid3" "src/tools/page_cycler/acid3"
+
+## setup chromium-angle into src/third_party/angle
+if [ -e "src/third_party/angle" ]; then
+	rm -rfv "src/third_party/angle"
+fi
+ln -v -s "$PWD/chromium-angle" "src/third_party/angle"
+
+## setup chromium-cld_3 into src/third_party/cld_3/src
+mkdir -p "src/third_party/cld_3"
+if [ -e "src/third_party/cld_3/src" ]; then
+	rm -rfv "src/third_party/cld_3/src"
+fi
+ln -v -s "$PWD/chromium-cld_3" "src/third_party/cld_3/src"
+
+## setup chromium-junit into src/third_party/junit/src
+mkdir -p "src/third_party/junit"
+if [ -e "src/third_party/junit/src" ]; then
+	rm -rfv "src/third_party/junit/src"
+fi
+ln -v -s "$PWD/chromium-junit" "src/third_party/junit/src"
+
+## setup chromium-webgl into src/third_party/webgl/src
+mkdir -p "src/third_party/webgl"
+if [ -e "src/third_party/webgl/src" ]; then
+	rm -rfv "src/third_party/webgl/src"
+fi
+ln -v -s "$PWD/chromium-webgl" "src/third_party/webgl/src"
+
+## setup chromium-crc32c into src/third_party/crc32c/src
+mkdir -p "src/third_party/crc32c"
+if [ -e "src/third_party/crc32c/src" ]; then
+	rm -rfv "src/third_party/crc32c/src"
+fi
+ln -v -s "$PWD/chromium-crc32c" "src/third_party/crc32c/src"
+
+## setup chromium-ffmpeg into src/third_party/ffmpeg
+if [ -e "src/third_party/ffmpeg" ]; then
+	rm -rfv "src/third_party/ffmpeg"
+fi
+ln -v -s "$PWD/chromium-ffmpeg" "src/third_party/ffmpeg"
+
+## setup chromium-fuzzer into src/third_party/libFuzzer/src
+mkdir -p "src/third_party/libFuzzer"
+if [ -e "src/third_party/libFuzzer/src" ]; then
+	rm -rfv "src/third_party/libFuzzer/src"
+fi
+ln -v -s "$PWD/chromium-fuzzer" "src/third_party/libFuzzer/src"
+
+## setup chromium-libcxx into src/buildtools/third_party/libc++/trunk
+mkdir -p "src/buildtools/third_party/libc++"
+if [ -e "src/buildtools/third_party/libc++/trunk" ]; then
+	rm -rfv "src/buildtools/third_party/libc++/trunk"
+fi
+ln -v -s "$PWD/chromium-libcxx" "src/buildtools/third_party/libc++/trunk"
+
+## setup chromium-libdrm into src/third_party/libdrm/src
+mkdir -p "src/third_party/libdrm"
+if [ -e "src/third_party/libdrm/src" ]; then
+	rm -rfv "src/third_party/libdrm/src"
+fi
+ln -v -s "$PWD/chromium-libdrm" "src/third_party/libdrm/src"
+
+## setup chromium-libvpx into src/third_party/libvpx/source/libvpx
+mkdir -p "src/third_party/libvpx/source"
+if [ -e "src/third_party/libvpx/source/libvpx" ]; then
+	rm -rfv "src/third_party/libvpx/source/libvpx"
+fi
+ln -v -s "$PWD/chromium-libvpx" "src/third_party/libvpx/source/libvpx"
+
+## setup chromium-libyuv into src/third_party/libyuv
+if [ -e "src/third_party/libyuv" ]; then
+	rm -rfv "src/third_party/libyuv"
+fi
+ln -v -s "$PWD/chromium-libyuv" "src/third_party/libyuv"
+
+## setup chromium-netty4 into src/third_party/netty4/src
+mkdir -p "src/third_party/netty4"
+if [ -e "src/third_party/netty4/src" ]; then
+	rm -rfv "src/third_party/netty4/src"
+fi
+ln -v -s "$PWD/chromium-netty4" "src/third_party/netty4/src"
+
+## setup chromium-pdfium into src/third_party/pdfium
+if [ -e "src/third_party/pdfium" ]; then
+	rm -rfv "src/third_party/pdfium"
+fi
+ln -v -s "$PWD/chromium-pdfium" "src/third_party/pdfium"
+
+## setup chromium-sfntly into src/third_party/sfntly/src
+mkdir -p "src/third_party/sfntly"
+if [ -e "src/third_party/sfntly/src" ]; then
+	rm -rfv "src/third_party/sfntly/src"
+fi
+ln -v -s "$PWD/chromium-sfntly" "src/third_party/sfntly/src"
+
+## setup chromium-snappy into src/third_party/snappy/src
+mkdir -p "src/third_party/snappy"
+if [ -e "src/third_party/snappy/src" ]; then
+	rm -rfv "src/third_party/snappy/src"
+fi
+ln -v -s "$PWD/chromium-snappy" "src/third_party/snappy/src"
+
+## setup chromium-webrtc into src/third_party/webrtc
+if [ -e "src/third_party/webrtc" ]; then
+	rm -rfv "src/third_party/webrtc"
+fi
+ln -v -s "$PWD/chromium-webrtc" "src/third_party/webrtc"
+
+## setup chromium-content into src/chrome/test/data/perf/frame_rate/content
+mkdir -p "src/chrome/test/data/perf/frame_rate"
+if [ -e "src/chrome/test/data/perf/frame_rate/content" ]; then
+	rm -rfv "src/chrome/test/data/perf/frame_rate/content"
+fi
+ln -v -s "$PWD/chromium-content" "src/chrome/test/data/perf/frame_rate/content"
+
+## setup chromium-glslang into src/third_party/glslang/src
+mkdir -p "src/third_party/glslang"
+if [ -e "src/third_party/glslang/src" ]; then
+	rm -rfv "src/third_party/glslang/src"
+fi
+ln -v -s "$PWD/chromium-glslang" "src/third_party/glslang/src"
+
+## setup chromium-jsoncpp into src/third_party/jsoncpp/source
+mkdir -p "src/third_party/jsoncpp"
+if [ -e "src/third_party/jsoncpp/source" ]; then
+	rm -rfv "src/third_party/jsoncpp/source"
+fi
+ln -v -s "$PWD/chromium-jsoncpp" "src/third_party/jsoncpp/source"
+
+## setup chromium-jsr-305 into src/third_party/jsr-305/src
+mkdir -p "src/third_party/jsr-305"
+if [ -e "src/third_party/jsr-305/src" ]; then
+	rm -rfv "src/third_party/jsr-305/src"
+fi
+ln -v -s "$PWD/chromium-jsr-305" "src/third_party/jsr-305/src"
+
+## setup chromium-leveldb into src/third_party/leveldatabase/src
+mkdir -p "src/third_party/leveldatabase"
+if [ -e "src/third_party/leveldatabase/src" ]; then
+	rm -rfv "src/third_party/leveldatabase/src"
+fi
+ln -v -s "$PWD/chromium-leveldb" "src/third_party/leveldatabase/src"
+
+## setup chromium-libsrtp into src/third_party/libsrtp
+if [ -e "src/third_party/libsrtp" ]; then
+	rm -rfv "src/third_party/libsrtp"
+fi
+ln -v -s "$PWD/chromium-libsrtp" "src/third_party/libsrtp"
+
+## setup chromium-libsync into src/third_party/libsync/src
+mkdir -p "src/third_party/libsync"
+if [ -e "src/third_party/libsync/src" ]; then
+	rm -rfv "src/third_party/libsync/src"
+fi
+ln -v -s "$PWD/chromium-libsync" "src/third_party/libsync/src"
+
+## setup chromium-libwebm into src/third_party/libwebm/source
+mkdir -p "src/third_party/libwebm"
+if [ -e "src/third_party/libwebm/source" ]; then
+	rm -rfv "src/third_party/libwebm/source"
+fi
+ln -v -s "$PWD/chromium-libwebm" "src/third_party/libwebm/source"
+
+## setup chromium-minigbm into src/third_party/minigbm/src
+mkdir -p "src/third_party/minigbm"
+if [ -e "src/third_party/minigbm/src" ]; then
+	rm -rfv "src/third_party/minigbm/src"
+fi
+ln -v -s "$PWD/chromium-minigbm" "src/third_party/minigbm/src"
+
+## setup chromium-minizip into src/third_party/minizip/src
+mkdir -p "src/third_party/minizip"
+if [ -e "src/third_party/minizip/src" ]; then
+	rm -rfv "src/third_party/minizip/src"
+fi
+ln -v -s "$PWD/chromium-minizip" "src/third_party/minizip/src"
+
+## setup chromium-mockito into src/third_party/mockito/src
+mkdir -p "src/third_party/mockito"
+if [ -e "src/third_party/mockito/src" ]; then
+	rm -rfv "src/third_party/mockito/src"
+fi
+ln -v -s "$PWD/chromium-mockito" "src/third_party/mockito/src"
+
+## setup chromium-openmax into src/third_party/openmax_dl
+if [ -e "src/third_party/openmax_dl" ]; then
+	rm -rfv "src/third_party/openmax_dl"
+fi
+ln -v -s "$PWD/chromium-openmax" "src/third_party/openmax_dl"
+
+## setup chromium-shaderc into src/third_party/shaderc/src
+mkdir -p "src/third_party/shaderc"
+if [ -e "src/third_party/shaderc/src" ]; then
+	rm -rfv "src/third_party/shaderc/src"
+fi
+ln -v -s "$PWD/chromium-shaderc" "src/third_party/shaderc/src"
+
+## setup chromium-usrsctp into src/third_party/usrsctp/usrsctplib
+mkdir -p "src/third_party/usrsctp"
+if [ -e "src/third_party/usrsctp/usrsctplib" ]; then
+	rm -rfv "src/third_party/usrsctp/usrsctplib"
+fi
+ln -v -s "$PWD/chromium-usrsctp" "src/third_party/usrsctp/usrsctplib"
+
+## setup chromium-wayland into src/third_party/wayland/src
+mkdir -p "src/third_party/wayland"
+if [ -e "src/third_party/wayland/src" ]; then
+	rm -rfv "src/third_party/wayland/src"
+fi
+ln -v -s "$PWD/chromium-wayland" "src/third_party/wayland/src"
+
+## setup chromium-breakpad into src/third_party/breakpad/breakpad
+mkdir -p "src/third_party/breakpad"
+if [ -e "src/third_party/breakpad/breakpad" ]; then
+	rm -rfv "src/third_party/breakpad/breakpad"
+fi
+ln -v -s "$PWD/chromium-breakpad" "src/third_party/breakpad/breakpad"
+
+## setup chromium-catapult into src/third_party/catapult
+if [ -e "src/third_party/catapult" ]; then
+	rm -rfv "src/third_party/catapult"
+fi
+ln -v -s "$PWD/chromium-catapult" "src/third_party/catapult"
+
+## setup chromium-chromite into src/third_party/chromite
+if [ -e "src/third_party/chromite" ]; then
+	rm -rfv "src/third_party/chromite"
+fi
+ln -v -s "$PWD/chromium-chromite" "src/third_party/chromite"
+
+## setup chromium-colorama into src/third_party/colorama/src
+mkdir -p "src/third_party/colorama"
+if [ -e "src/third_party/colorama/src" ]; then
+	rm -rfv "src/third_party/colorama/src"
+fi
+ln -v -s "$PWD/chromium-colorama" "src/third_party/colorama/src"
+
+## setup chromium-elfutils into src/third_party/elfutils/src
+mkdir -p "src/third_party/elfutils"
+if [ -e "src/third_party/elfutils/src" ]; then
+	rm -rfv "src/third_party/elfutils/src"
+fi
+ln -v -s "$PWD/chromium-elfutils" "src/third_party/elfutils/src"
+
+## setup chromium-findbugs into src/third_party/findbugs
+if [ -e "src/third_party/findbugs" ]; then
+	rm -rfv "src/third_party/findbugs"
+fi
+ln -v -s "$PWD/chromium-findbugs" "src/third_party/findbugs"
+
+## setup chromium-gestures into src/third_party/gestures/gestures
+mkdir -p "src/third_party/gestures"
+if [ -e "src/third_party/gestures/gestures" ]; then
+	rm -rfv "src/third_party/gestures/gestures"
+fi
+ln -v -s "$PWD/chromium-gestures" "src/third_party/gestures/gestures"
+
+## setup chromium-libevdev into src/third_party/libevdev/src
+mkdir -p "src/third_party/libevdev"
+if [ -e "src/third_party/libevdev/src" ]; then
+	rm -rfv "src/third_party/libevdev/src"
+fi
+ln -v -s "$PWD/chromium-libevdev" "src/third_party/libevdev/src"
+
+## setup chromium-openh264 into src/third_party/openh264/src
+mkdir -p "src/third_party/openh264"
+if [ -e "src/third_party/openh264/src" ]; then
+	rm -rfv "src/third_party/openh264/src"
+fi
+ln -v -s "$PWD/chromium-openh264" "src/third_party/openh264/src"
+
+## setup chromium-perfetto into src/third_party/perfetto
+if [ -e "src/third_party/perfetto" ]; then
+	rm -rfv "src/third_party/perfetto"
+fi
+ln -v -s "$PWD/chromium-perfetto" "src/third_party/perfetto"
+
+## setup chromium-requests into src/third_party/requests/src
+mkdir -p "src/third_party/requests"
+if [ -e "src/third_party/requests/src" ]; then
+	rm -rfv "src/third_party/requests/src"
+fi
+ln -v -s "$PWD/chromium-requests" "src/third_party/requests/src"
+
+## setup chromium-smhasher into src/third_party/smhasher/src
+mkdir -p "src/third_party/smhasher"
+if [ -e "src/third_party/smhasher/src" ]; then
+	rm -rfv "src/third_party/smhasher/src"
+fi
+ln -v -s "$PWD/chromium-smhasher" "src/third_party/smhasher/src"
+
+## setup chromium-boringssl into src/third_party/boringssl/src
+mkdir -p "src/third_party/boringssl"
+if [ -e "src/third_party/boringssl/src" ]; then
+	rm -rfv "src/third_party/boringssl/src"
+fi
+ln -v -s "$PWD/chromium-boringssl" "src/third_party/boringssl/src"
+
+## setup chromium-client-py into src/tools/swarming_client
+if [ -e "src/tools/swarming_client" ]; then
+	rm -rfv "src/tools/swarming_client"
+fi
+ln -v -s "$PWD/chromium-client-py" "src/tools/swarming_client"
+
+## setup chromium-freetype2 into src/third_party/freetype/src
+mkdir -p "src/third_party/freetype"
+if [ -e "src/third_party/freetype/src" ]; then
+	rm -rfv "src/third_party/freetype/src"
+fi
+ln -v -s "$PWD/chromium-freetype2" "src/third_party/freetype/src"
+
+## setup chromium-libcxxabi into src/buildtools/third_party/libc++abi/trunk
+mkdir -p "src/buildtools/third_party/libc++abi"
+if [ -e "src/buildtools/third_party/libc++abi/trunk" ]; then
+	rm -rfv "src/buildtools/third_party/libc++abi/trunk"
+fi
+ln -v -s "$PWD/chromium-libcxxabi" "src/buildtools/third_party/libc++abi/trunk"
+
+## setup chromium-libunwind into src/buildtools/third_party/libunwind/trunk
+mkdir -p "src/buildtools/third_party/libunwind"
+if [ -e "src/buildtools/third_party/libunwind/trunk" ]; then
+	rm -rfv "src/buildtools/third_party/libunwind/trunk"
+fi
+ln -v -s "$PWD/chromium-libunwind" "src/buildtools/third_party/libunwind/trunk"
+
+## setup chromium-pyftpdlib into src/third_party/pyftpdlib/src
+mkdir -p "src/third_party/pyftpdlib"
+if [ -e "src/third_party/pyftpdlib/src" ]; then
+	rm -rfv "src/third_party/pyftpdlib/src"
+fi
+ln -v -s "$PWD/chromium-pyftpdlib" "src/third_party/pyftpdlib/src"
+
+## setup chromium-xdg-utils into src/third_party/xdg-utils
+if [ -e "src/third_party/xdg-utils" ]; then
+	rm -rfv "src/third_party/xdg-utils"
+fi
+ln -v -s "$PWD/chromium-xdg-utils" "src/third_party/xdg-utils"
+
+## setup chromium-buildtools into src/buildtools
+if [ -e "src/buildtools" ]; then
+	rm -rfv "src/buildtools"
+fi
+ln -v -s "$PWD/chromium-buildtools" "src/buildtools"
+
+## setup chromium-errorprone into src/third_party/errorprone/lib
+mkdir -p "src/third_party/errorprone"
+if [ -e "src/third_party/errorprone/lib" ]; then
+	rm -rfv "src/third_party/errorprone/lib"
+fi
+ln -v -s "$PWD/chromium-errorprone" "src/third_party/errorprone/lib"
+
+## setup chromium-fontconfig into src/third_party/fontconfig/src
+mkdir -p "src/third_party/fontconfig"
+if [ -e "src/third_party/fontconfig/src" ]; then
+	rm -rfv "src/third_party/fontconfig/src"
+fi
+ln -v -s "$PWD/chromium-fontconfig" "src/third_party/fontconfig/src"
+
+## setup chromium-googletest into src/third_party/googletest/src
+mkdir -p "src/third_party/googletest"
+if [ -e "src/third_party/googletest/src" ]; then
+	rm -rfv "src/third_party/googletest/src"
+fi
+ln -v -s "$PWD/chromium-googletest" "src/third_party/googletest/src"
+
+## setup chromium-leakcanary into src/third_party/leakcanary/src
+mkdir -p "src/third_party/leakcanary"
+if [ -e "src/third_party/leakcanary/src" ]; then
+	rm -rfv "src/third_party/leakcanary/src"
+fi
+ln -v -s "$PWD/chromium-leakcanary" "src/third_party/leakcanary/src"
+
+## setup chromium-pyelftools into src/third_party/pyelftools
+if [ -e "src/third_party/pyelftools" ]; then
+	rm -rfv "src/third_party/pyelftools"
+fi
+ln -v -s "$PWD/chromium-pyelftools" "src/third_party/pyelftools"
+
+## setup chromium-system_api into src/third_party/cros_system_api
+if [ -e "src/third_party/cros_system_api" ]; then
+	rm -rfv "src/third_party/cros_system_api"
+fi
+ln -v -s "$PWD/chromium-system_api" "src/third_party/cros_system_api"
+
+## setup chromium-webvr.info into src/chrome/test/data/vr/webvr_info
+mkdir -p "src/chrome/test/data/vr"
+if [ -e "src/chrome/test/data/vr/webvr_info" ]; then
+	rm -rfv "src/chrome/test/data/vr/webvr_info"
+fi
+ln -v -s "$PWD/chromium-webvr.info" "src/chrome/test/data/vr/webvr_info"
+
+## setup chromium-SPIRV-Tools into src/third_party/SPIRV-Tools/src
+mkdir -p "src/third_party/SPIRV-Tools"
+if [ -e "src/third_party/SPIRV-Tools/src" ]; then
+	rm -rfv "src/third_party/SPIRV-Tools/src"
+fi
+ln -v -s "$PWD/chromium-SPIRV-Tools" "src/third_party/SPIRV-Tools/src"
+
+## setup chromium-SwiftShader into src/third_party/swiftshader
+if [ -e "src/third_party/swiftshader" ]; then
+	rm -rfv "src/third_party/swiftshader"
+fi
+ln -v -s "$PWD/chromium-SwiftShader" "src/third_party/swiftshader"
+
+## setup chromium-android_ndk into src/third_party/android_ndk
+if [ -e "src/third_party/android_ndk" ]; then
+	rm -rfv "src/third_party/android_ndk"
+fi
+ln -v -s "$PWD/chromium-android_ndk" "src/third_party/android_ndk"
+
+## setup chromium-android_ndk into src/third_party/android_tools/ndk
+mkdir -p "src/third_party/android_tools"
+if [ -e "src/third_party/android_tools/ndk" ]; then
+	rm -rfv "src/third_party/android_tools/ndk"
+fi
+ln -v -s "$PWD/chromium-android_ndk" "src/third_party/android_tools/ndk"
+
+## setup DepotTools into src/third_party/depot_tools
+if [ -e "src/third_party/depot_tools" ]; then
+	rm -rfv "src/third_party/depot_tools"
+fi
+ln -v -s "$PWD/DepotTools" "src/third_party/depot_tools"
+
+## setup chromium-flatbuffers into src/third_party/flatbuffers/src
+mkdir -p "src/third_party/flatbuffers"
+if [ -e "src/third_party/flatbuffers/src" ]; then
+	rm -rfv "src/third_party/flatbuffers/src"
+fi
+ln -v -s "$PWD/chromium-flatbuffers" "src/third_party/flatbuffers/src"
+
+## setup chromium-pywebsocket into src/third_party/pywebsocket/src
+mkdir -p "src/third_party/pywebsocket"
+if [ -e "src/third_party/pywebsocket/src" ]; then
+	rm -rfv "src/third_party/pywebsocket/src"
+fi
+ln -v -s "$PWD/chromium-pywebsocket" "src/third_party/pywebsocket/src"
+
+## setup chromium-robolectric into src/third_party/robolectric/robolectric
+mkdir -p "src/third_party/robolectric"
+if [ -e "src/third_party/robolectric/robolectric" ]; then
+	rm -rfv "src/third_party/robolectric/robolectric"
+fi
+ln -v -s "$PWD/chromium-robolectric" "src/third_party/robolectric/robolectric"
+
+## setup chromium-spirv-tools into src/third_party/spirv-tools-angle/src
+mkdir -p "src/third_party/spirv-tools-angle"
+if [ -e "src/third_party/spirv-tools-angle/src" ]; then
+	rm -rfv "src/third_party/spirv-tools-angle/src"
+fi
+ln -v -s "$PWD/chromium-spirv-tools" "src/third_party/spirv-tools-angle/src"
+
+## setup chromium-canvas_bench into src/chrome/test/data/perf/canvas_bench
+mkdir -p "src/chrome/test/data/perf"
+if [ -e "src/chrome/test/data/perf/canvas_bench" ]; then
+	rm -rfv "src/chrome/test/data/perf/canvas_bench"
+fi
+ln -v -s "$PWD/chromium-canvas_bench" "src/chrome/test/data/perf/canvas_bench"
+
+## setup chromium-clang-format into src/buildtools/clang_format/script
+mkdir -p "src/buildtools/clang_format"
+if [ -e "src/buildtools/clang_format/script" ]; then
+	rm -rfv "src/buildtools/clang_format/script"
+fi
+ln -v -s "$PWD/chromium-clang-format" "src/buildtools/clang_format/script"
+
+## setup chromium-patched-yasm into src/third_party/yasm/source/patched-yasm
+mkdir -p "src/third_party/yasm/source"
+if [ -e "src/third_party/yasm/source/patched-yasm" ]; then
+	rm -rfv "src/third_party/yasm/source/patched-yasm"
+fi
+ln -v -s "$PWD/chromium-patched-yasm" "src/third_party/yasm/source/patched-yasm"
+
+## setup chromium-android_tools into src/third_party/android_tools
+if [ -e "src/third_party/android_tools" ]; then
+	rm -rfv "src/third_party/android_tools"
+fi
+ln -v -s "$PWD/chromium-android_tools" "src/third_party/android_tools"
+
+## setup chromium-glslang-angle into src/third_party/glslang-angle/src
+mkdir -p "src/third_party/glslang-angle"
+if [ -e "src/third_party/glslang-angle/src" ]; then
+	rm -rfv "src/third_party/glslang-angle/src"
+fi
+ln -v -s "$PWD/chromium-glslang-angle" "src/third_party/glslang-angle/src"
+
+## setup chromium-libjpeg_turbo into src/third_party/libjpeg_turbo
+if [ -e "src/third_party/libjpeg_turbo" ]; then
+	rm -rfv "src/third_party/libjpeg_turbo"
+fi
+ln -v -s "$PWD/chromium-libjpeg_turbo" "src/third_party/libjpeg_turbo"
+
+## setup chromium-spirv-headers into src/third_party/spirv-headers/src
+mkdir -p "src/third_party/spirv-headers"
+if [ -e "src/third_party/spirv-headers/src" ]; then
+	rm -rfv "src/third_party/spirv-headers/src"
+fi
+ln -v -s "$PWD/chromium-spirv-headers" "src/third_party/spirv-headers/src"
+
+## setup chromium-visualmetrics into src/third_party/visualmetrics/src
+mkdir -p "src/third_party/visualmetrics"
+if [ -e "src/third_party/visualmetrics/src" ]; then
+	rm -rfv "src/third_party/visualmetrics/src"
+fi
+ln -v -s "$PWD/chromium-visualmetrics" "src/third_party/visualmetrics/src"
+
+## setup chromium-libphonenumber into src/third_party/libphonenumber/dist
+mkdir -p "src/third_party/libphonenumber"
+if [ -e "src/third_party/libphonenumber/dist" ]; then
+	rm -rfv "src/third_party/libphonenumber/dist"
+fi
+ln -v -s "$PWD/chromium-libphonenumber" "src/third_party/libphonenumber/dist"
+
+## setup chromium-netty-tcnative into src/third_party/netty-tcnative/src
+mkdir -p "src/third_party/netty-tcnative"
+if [ -e "src/third_party/netty-tcnative/src" ]; then
+	rm -rfv "src/third_party/netty-tcnative/src"
+fi
+ln -v -s "$PWD/chromium-netty-tcnative" "src/third_party/netty-tcnative/src"
+
+## setup chromium-ub-uiautomator into src/third_party/ub-uiautomator/lib
+mkdir -p "src/third_party/ub-uiautomator"
+if [ -e "src/third_party/ub-uiautomator/lib" ]; then
+	rm -rfv "src/third_party/ub-uiautomator/lib"
+fi
+ln -v -s "$PWD/chromium-ub-uiautomator" "src/third_party/ub-uiautomator/lib"
+
+## setup chromium-compact_enc_det into src/third_party/ced/src
+mkdir -p "src/third_party/ced"
+if [ -e "src/third_party/ced/src" ]; then
+	rm -rfv "src/third_party/ced/src"
+fi
+ln -v -s "$PWD/chromium-compact_enc_det" "src/third_party/ced/src"
+
+## setup chromium-gvr-android-sdk into src/third_party/gvr-android-sdk/src
+mkdir -p "src/third_party/gvr-android-sdk"
+if [ -e "src/third_party/gvr-android-sdk/src" ]; then
+	rm -rfv "src/third_party/gvr-android-sdk/src"
+fi
+ln -v -s "$PWD/chromium-gvr-android-sdk" "src/third_party/gvr-android-sdk/src"
+
+## setup chromium-libaddressinput into src/third_party/libaddressinput/src
+mkdir -p "src/third_party/libaddressinput"
+if [ -e "src/third_party/libaddressinput/src" ]; then
+	rm -rfv "src/third_party/libaddressinput/src"
+fi
+ln -v -s "$PWD/chromium-libaddressinput" "src/third_party/libaddressinput/src"
+
+## setup chromium-liblouis-github into src/third_party/liblouis/src
+mkdir -p "src/third_party/liblouis"
+if [ -e "src/third_party/liblouis/src" ]; then
+	rm -rfv "src/third_party/liblouis/src"
+fi
+ln -v -s "$PWD/chromium-liblouis-github" "src/third_party/liblouis/src"
+
+## setup chromium-android_protobuf into src/third_party/android_protobuf/src
+mkdir -p "src/third_party/android_protobuf"
+if [ -e "src/third_party/android_protobuf/src" ]; then
+	rm -rfv "src/third_party/android_protobuf/src"
+fi
+ln -v -s "$PWD/chromium-android_protobuf" "src/third_party/android_protobuf/src"
+
+## setup chromium-wayland-protocols into src/third_party/wayland-protocols/src
+mkdir -p "src/third_party/wayland-protocols"
+if [ -e "src/third_party/wayland-protocols/src" ]; then
+	rm -rfv "src/third_party/wayland-protocols/src"
+fi
+ln -v -s "$PWD/chromium-wayland-protocols" "src/third_party/wayland-protocols/src"
+
+## setup chromium-custom-tabs-client into src/third_party/custom_tabs_client/src
+mkdir -p "src/third_party/custom_tabs_client"
+if [ -e "src/third_party/custom_tabs_client/src" ]; then
+	rm -rfv "src/third_party/custom_tabs_client/src"
+fi
+ln -v -s "$PWD/chromium-custom-tabs-client" "src/third_party/custom_tabs_client/src"
+
+## setup chromium-libprotobuf-mutator into src/third_party/libprotobuf-mutator/src
+mkdir -p "src/third_party/libprotobuf-mutator"
+if [ -e "src/third_party/libprotobuf-mutator/src" ]; then
+	rm -rfv "src/third_party/libprotobuf-mutator/src"
+fi
+ln -v -s "$PWD/chromium-libprotobuf-mutator" "src/third_party/libprotobuf-mutator/src"
+
+## setup chromium-devtools-node-modules into src/third_party/devtools-node-modules
+if [ -e "src/third_party/devtools-node-modules" ]; then
+	rm -rfv "src/third_party/devtools-node-modules"
+fi
+ln -v -s "$PWD/chromium-devtools-node-modules" "src/third_party/devtools-node-modules"
+
+## setup chromium-hunspell_dictionaries into src/third_party/hunspell_dictionaries
+if [ -e "src/third_party/hunspell_dictionaries" ]; then
+	rm -rfv "src/third_party/hunspell_dictionaries"
+fi
+ln -v -s "$PWD/chromium-hunspell_dictionaries" "src/third_party/hunspell_dictionaries"
+
+## setup chromium-linux-syscall-support into src/third_party/lss
+if [ -e "src/third_party/lss" ]; then
+	rm -rfv "src/third_party/lss"
+fi
+ln -v -s "$PWD/chromium-linux-syscall-support" "src/third_party/lss"
+
+## setup chromium-apache-portable-runtime into src/third_party/apache-portable-runtime/src
+mkdir -p "src/third_party/apache-portable-runtime"
+if [ -e "src/third_party/apache-portable-runtime/src" ]; then
+	rm -rfv "src/third_party/apache-portable-runtime/src"
+fi
+ln -v -s "$PWD/chromium-apache-portable-runtime" "src/third_party/apache-portable-runtime/src"
+
+## setup chromium-vulkan-validation-layers into src/third_party/vulkan-validation-layers/src
+mkdir -p "src/third_party/vulkan-validation-layers"
+if [ -e "src/third_party/vulkan-validation-layers/src" ]; then
+	rm -rfv "src/third_party/vulkan-validation-layers/src"
+fi
+ln -v -s "$PWD/chromium-vulkan-validation-layers" "src/third_party/vulkan-validation-layers/src"
+
+echo 'All srclibs ready for gclient sync'
@@ -0,0 +1,14 @@
+solutions = [
+  { "name"        : "src",
+    "url"         : "https://chromium.googlesource.com/chromium/src.git",
+    "deps_file"   : "DEPS",
+    "managed"     : True,
+    "custom_deps" : {
+    },
+    "custom_vars": {
+      'checkout_nacl': False
+    },
+  },
+]
+cache_dir = None
+target_os = ["android"];
@@ -0,0 +1,110 @@
+entries = {
+  'src': 'https://chromium.googlesource.com/chromium/src.git',
+  'src/buildtools': 'https://chromium.googlesource.com/chromium/buildtools.git@f115f4786771afdfacb18a2299541b23e21f4792',
+  'src/chrome/test/data/perf/canvas_bench': 'https://chromium.googlesource.com/chromium/canvas_bench.git@a7b40ea5ae0239517d78845a5fc9b12976bfc732',
+  'src/chrome/test/data/perf/frame_rate/content': 'https://chromium.googlesource.com/chromium/frame_rate/content.git@c10272c88463efeef6bb19c9ec07c42bc8fe22b9',
+  'src/chrome/test/data/vr/webvr_info': 'https://chromium.googlesource.com/external/github.com/toji/webvr.info.git@c58ae99b9ff9e2aa4c524633519570bf33536248',
+  'src/media/cdm/api': 'https://chromium.googlesource.com/chromium/cdm.git@ca7130aa8fe6dd6c0664b52768d1957af31ae91b',
+  'src/third_party/SPIRV-Tools/src': 'https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@9166854ac93ef81b026e943ccd230fed6c8b8d3c',
+  'src/third_party/android_ndk': 'https://chromium.googlesource.com/android_ndk.git@e951c37287c7d8cd915bf8d4149fd4a06d808b55',
+  'src/third_party/android_protobuf/src': 'https://chromium.googlesource.com/external/android_protobuf.git@7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f',
+  'src/third_party/android_tools': 'https://chromium.googlesource.com/android_tools.git@c9f9bbf0a6c862fbef6115e80e8617093cd58e6b',
+  'src/third_party/angle': 'https://chromium.googlesource.com/angle/angle.git@e4741fd0f2bce711a90bdebe2ac8e83cf944b8e8',
+  'src/third_party/apache-portable-runtime/src': 'https://chromium.googlesource.com/external/apache-portable-runtime.git@c3f11fcd86b42922834cae91103cf068246c6bb6',
+  'src/third_party/auto/src': 'https://chromium.googlesource.com/external/github.com/google/auto.git@8a81a858ae7b78a1aef71ac3905fade0bbd64e82',
+  'src/third_party/bidichecker': 'https://chromium.googlesource.com/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
+  'src/third_party/boringssl/src': 'https://boringssl.googlesource.com/boringssl.git@94cd196a80252c98e329e979870f2a462cc4f402',
+  'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@4a02ec03038d9d6f870f42d5070591512f488db0',
+  'src/third_party/catapult': 'https://chromium.googlesource.com/catapult.git@69f2184e9c4351f5216d1ebe52bfd4c37ea79081',
+  'src/third_party/ced/src': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9',
+  'src/third_party/chromite': 'https://chromium.googlesource.com/chromiumos/chromite.git@5b16d08cfaf8b1fc689a9c68258c258f4ad0fff8',
+  'src/third_party/cld_3/src': 'https://chromium.googlesource.com/external/github.com/google/cld_3.git@ae02d6b8a2af41e87c956c7c7d3f651a8b7b9e79',
+  'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
+  'src/third_party/crc32c/src': 'https://chromium.googlesource.com/external/github.com/google/crc32c.git@0f771ed5ef83556451e1736f22b1a11054dc81c3',
+  'src/third_party/cros_system_api': 'https://chromium.googlesource.com/chromiumos/platform/system_api.git@55af1ecf95886bd60661dd7c62a9e32ec364afc1',
+  'src/third_party/custom_tabs_client/src': 'https://chromium.googlesource.com/custom-tabs-client.git@a0b6c6f7db4127c191ebb9ef008609224658edb2',
+  'src/third_party/depot_tools': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@7a4ced2773b2173c8ddc17c4895514706eb8df46',
+  'src/third_party/devtools-node-modules': 'https://chromium.googlesource.com/external/github.com/ChromeDevTools/devtools-node-modules@5f7cd2497d7a643125c3b6eb910d99ba28be6899',
+  'src/third_party/dom_distiller_js/dist': 'https://chromium.googlesource.com/chromium/dom-distiller/dist.git@60b46718e28f553ab57e3d2bbda5b3b41456f417',
+  'src/third_party/elfutils/src': 'https://chromium.googlesource.com/external/elfutils.git@249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
+  'src/third_party/errorprone/lib': 'https://chromium.googlesource.com/chromium/third_party/errorprone.git@ecc57c2b00627667874744b9ad8efe10734d97a8',
+  'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@3e444ad8860b5d90d40a5c6e19947aba376a976b',
+  'src/third_party/findbugs': 'https://chromium.googlesource.com/chromium/deps/findbugs.git@4275d9ac8610db6b1bc9a5e887f97e41b33fac67',
+  'src/third_party/flac': 'https://chromium.googlesource.com/chromium/deps/flac.git@7d0f5b3a173ffe98db08057d1f52b7787569e0a6',
+  'src/third_party/flatbuffers/src': 'https://chromium.googlesource.com/external/github.com/google/flatbuffers.git@01c50d57a67a52ee3cddd81b54d4647e9123a290',
+  'src/third_party/fontconfig/src': 'https://chromium.googlesource.com/external/fontconfig.git@b546940435ebfb0df575bc7a2350d1e913919c34',
+  'src/third_party/freetype/src': 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@994eb2b34934bc5face9f83b2d3b12cf7a9262ab',
+  'src/third_party/gestures/gestures': 'https://chromium.googlesource.com/chromiumos/platform/gestures.git@74f55100df966280d305d5d5ada824605f875839',
+  'src/third_party/glslang/src': 'https://chromium.googlesource.com/external/github.com/google/glslang.git@210c6bf4d8119dc5f8ac21da2d4c87184f7015e0',
+  'src/third_party/googletest/src': 'https://chromium.googlesource.com/external/github.com/google/googletest.git@0062e4869f07a3ef235703ddf63af604b712446c',
+  'src/third_party/gvr-android-sdk/src': 'https://chromium.googlesource.com/external/github.com/googlevr/gvr-android-sdk.git@6aef4ab34276aac81ee38f1cb1d034de7fc4a4eb',
+  'src/third_party/hunspell_dictionaries': 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git@a9bac57ce6c9d390a52ebaad3259f5fdb871210e',
+  'src/third_party/icu': 'https://chromium.googlesource.com/chromium/deps/icu.git@c8ca2962b46670ec89071ffd1291688983cd319c',
+  'src/third_party/jsoncpp/source': 'https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@f572e8e42e22cfcf5ab0aea26574f408943edfa4',
+  'src/third_party/jsr-305/src': 'https://chromium.googlesource.com/external/jsr-305.git@642c508235471f7220af6d5df2d3210e3bfc0919',
+  'src/third_party/junit/src': 'https://chromium.googlesource.com/external/junit.git@64155f8a9babcfcf4263cf4d08253a1556e75481',
+  'src/third_party/leakcanary/src': 'https://chromium.googlesource.com/external/github.com/square/leakcanary.git@608ded739e036a3aa69db47ac43777dcee506f8e',
+  'src/third_party/leveldatabase/src': 'https://chromium.googlesource.com/external/leveldb.git@ca216e493f32278f50a823811ab95f64cf0f839b',
+  'src/third_party/libFuzzer/src': 'https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git@ba2c1cd6f87accb32b5dbce297387c56a2e53a2f',
+  'src/third_party/libaddressinput/src': 'https://chromium.googlesource.com/external/libaddressinput.git@a575c63de328d0c72237c55d1a05e191c245122a',
+  'src/third_party/libaom/source/libaom': 'https://aomedia.googlesource.com/aom.git@cc92258a08d98f469dff1be288acbc322632377b',
+  'src/third_party/libdrm/src': 'https://chromium.googlesource.com/chromiumos/third_party/libdrm.git@16ffb1e6fce0fbd57f7a1e76021c575a40f6dc7a',
+  'src/third_party/libevdev/src': 'https://chromium.googlesource.com/chromiumos/platform/libevdev.git@9f7a1961eb4726211e18abd147d5a11a4ea86744',
+  'src/third_party/libjpeg_turbo': 'https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd',
+  'src/third_party/liblouis/src': 'https://chromium.googlesource.com/external/liblouis-github.git@5f9c03f2a3478561deb6ae4798175094be8a26c2',
+  'src/third_party/libphonenumber/dist': 'https://chromium.googlesource.com/external/libphonenumber.git@a4da30df63a097d67e3c429ead6790ad91d36cf4',
+  'src/third_party/libprotobuf-mutator/src': 'https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git@3fc43a01d721ef1bacfefed170bc22abf1b8b051',
+  'src/third_party/libsrtp': 'https://chromium.googlesource.com/chromium/deps/libsrtp.git@1d45b8e599dc2db6ea3ae22dbc94a8c504652423',
+  'src/third_party/libsync/src': 'https://chromium.googlesource.com/aosp/platform/system/core/libsync.git@f4f4387b6bf2387efbcfd1453af4892e8982faf6',
+  'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@742ae4b24d28342a1642c9749826ee8428b20d6e',
+  'src/third_party/libwebm/source': 'https://chromium.googlesource.com/webm/libwebm.git@b03c65468b06d097f27235d93d76bfc45f490ede',
+  'src/third_party/libyuv': 'https://chromium.googlesource.com/libyuv/libyuv.git@92e22cf5b66173d5d5056751ca62bc2254e4ff86',
+  'src/third_party/lss': 'https://chromium.googlesource.com/linux-syscall-support.git@e6527b0cd469e3ff5764785dadcb39bf7d787154',
+  'src/third_party/mesa/src': 'https://chromium.googlesource.com/chromium/deps/mesa.git@ef811c6bd4de74e13e7035ca882cc77f85793fef',
+  'src/third_party/minigbm/src': 'https://chromium.googlesource.com/chromiumos/platform/minigbm.git@27a7e6a24709564e18c3382d0aeda0b40c7ae03b',
+  'src/third_party/minizip/src': 'https://chromium.googlesource.com/external/github.com/nmoinvaz/minizip@53a657318af1fccc4bac7ed230729302b2391d1d',
+  'src/third_party/mockito/src': 'https://chromium.googlesource.com/external/mockito/mockito.git@de83ad4598ad4cf5ea53c69a8a8053780b04b850',
+  'src/third_party/netty-tcnative/src': 'https://chromium.googlesource.com/external/netty-tcnative.git@5b46a8ef4a39c39c576fcdaaf718b585d75df463',
+  'src/third_party/netty4/src': 'https://chromium.googlesource.com/external/netty4.git@cc4420b13bb4eeea5b1cf4f93b2755644cd3b120',
+  'src/third_party/openh264/src': 'https://chromium.googlesource.com/external/github.com/cisco/openh264@2e96d62426547ac4fb5cbcd122e5f6eb68d66ee6',
+  'src/third_party/openmax_dl': 'https://webrtc.googlesource.com/deps/third_party/openmax.git@b611996df3b8f6b151339d22c12c21f167009cb6',
+  'src/third_party/pdfium': 'https://pdfium.googlesource.com/pdfium.git@bc4869293d7869c06e3f8c18241447ec5b701b58',
+  'src/third_party/perfetto': 'https://android.googlesource.com/platform/external/perfetto.git@135841c8077f13f14c6b80e32d391da84d2ee131',
+  'src/third_party/pyelftools': 'https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git@19b3e610c86fcadb837d252c794cb5e8008826ae',
+  'src/third_party/pyftpdlib/src': 'https://chromium.googlesource.com/external/pyftpdlib.git@2be6d65e31c7ee6320d059f581f05ae8d89d7e45',
+  'src/third_party/pywebsocket/src': 'https://chromium.googlesource.com/external/github.com/google/pywebsocket.git@2d7b73c3acbd0f41dcab487ae5c97c6feae06ce2',
+  'src/third_party/re2/src': 'https://chromium.googlesource.com/external/github.com/google/re2.git@5185d85264d23cfae4b38e2703703e9a4c8e974c',
+  'src/third_party/requests/src': 'https://chromium.googlesource.com/external/github.com/kennethreitz/requests.git@f172b30356d821d180fa4ecfa3e71c7274a32de4',
+  'src/third_party/robolectric/robolectric': 'https://chromium.googlesource.com/external/robolectric.git@7e067f1112e1502caa742f7be72d37b5678d3403',
+  'src/third_party/sfntly/src': 'https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@16f3404e41edc9708a51fbce481f22e46b809686',
+  'src/third_party/shaderc/src': 'https://chromium.googlesource.com/external/github.com/google/shaderc.git@cd8793c34907073025af2622c28bcee64e9879a4',
+  'src/third_party/skia': 'https://skia.googlesource.com/skia.git@caaf211e8dd094db6b7408cecdf531ce7d91382c',
+  'src/third_party/smhasher/src': 'https://chromium.googlesource.com/external/smhasher.git@e87738e57558e0ec472b2fc3a643b838e5b6e88f',
+  'src/third_party/snappy/src': 'https://chromium.googlesource.com/external/github.com/google/snappy.git@b02bfa754ebf27921d8da3bd2517eab445b84ff9',
+  'src/third_party/swiftshader': 'https://swiftshader.googlesource.com/SwiftShader.git@b1d452eaeeb8272e37b87446511f2e0e95d27e6f',
+  'src/third_party/ub-uiautomator/lib': 'https://chromium.googlesource.com/chromium/third_party/ub-uiautomator.git@00270549ce3161ae72ceb24712618ea28b4f9434',
+  'src/third_party/usrsctp/usrsctplib': 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@0e076261b832121cf120ddc04aaff87ac3a34d30',
+  'src/third_party/visualmetrics/src': 'https://chromium.googlesource.com/external/github.com/WPO-Foundation/visualmetrics.git@1edde9d2fe203229c895b648fdec355917200ad6',
+  'src/third_party/wayland-protocols/src': 'https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git@4f789286e4ab7f6fecc2ccb895d79362a9b2382a',
+  'src/third_party/wayland/src': 'https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git@1361da9cd5a719b32d978485a29920429a31ed25',
+  'src/third_party/wds/src': 'https://chromium.googlesource.com/external/github.com/01org/wds@ac3d8210d95f3000bf5c8e16a79dbbbf22d554a5',
+  'src/third_party/webdriver/pylib': 'https://chromium.googlesource.com/external/selenium/py.git@5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
+  'src/third_party/webgl/src': 'https://chromium.googlesource.com/external/khronosgroup/webgl.git@d458ada06171a85af00367251a4ed55db7fe2018',
+  'src/third_party/webrtc': 'https://webrtc.googlesource.com/src.git@22da89f502ab7ed618b7099f5010da021333bf71',
+  'src/third_party/xdg-utils': 'https://chromium.googlesource.com/chromium/deps/xdg-utils.git@d80274d5869b17b8c9067a1022e4416ee7ed5e0d',
+  'src/third_party/yasm/source/patched-yasm': 'https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@b98114e18d8b9b84586b10d24353ab8616d4c5fc',
+  'src/tools/gyp': 'https://chromium.googlesource.com/external/gyp.git@d61a9397e668fa9843c4aa7da9e79460fe590bfb',
+  'src/tools/page_cycler/acid3': 'https://chromium.googlesource.com/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
+  'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@88229872dd17e71658fe96763feaa77915d8cbd6',
+  'src/v8': 'https://chromium.googlesource.com/v8/v8.git@787ecbb389741d2b76131f9fa526374a0dbfcff6',
+  'src/buildtools/clang_format/script': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@0653eee0c81ea04715c635dd0885e8096ff6ba6d',
+  'src/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxx.git@27c341db41bc9df5c6f19cde65f002d6f1c2eb3c',
+  'src/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxxabi.git@e1601db2504857d44db88a5d4e2ca50b32bbb7d9',
+  'src/buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/llvm.org/libunwind.git@86ab23972978242b6f9e27cebc239f3e8428b1af',
+  'src/third_party/android_tools/ndk': 'https://chromium.googlesource.com/android_ndk.git@e951c37287c7d8cd915bf8d4149fd4a06d808b55',
+  'src/third_party/deqp/src': 'https://android.googlesource.com/platform/external/deqp@455d82c60b096e7bd83b6a2f5ed70c61e4bfa759',
+  'src/third_party/glslang-angle/src': 'https://android.googlesource.com/platform/external/shaderc/glslang@2edde6665d9a56ead5ea0e55b4e64d9a803e6164',
+  'src/third_party/spirv-headers/src': 'https://android.googlesource.com/platform/external/shaderc/spirv-headers@98b01515724c428d0f0a5d01deffcce0f5f5e61c',
+  'src/third_party/spirv-tools-angle/src': 'https://android.googlesource.com/platform/external/shaderc/spirv-tools@9996173f363729b3a97309685dbd4d78547a63a7',
+  'src/third_party/vulkan-validation-layers/src': 'https://android.googlesource.com/platform/external/vulkan-validation-layers@d5c8ed406ab2399a80e2847c03aa80b09b269b53',
+}
@@ -0,0 +1,40 @@
+#!/bin/bash
+## install-deps.sh
+##
+## @author csagan5
+##
+## Bromite dependencies setup script for F-Droid
+## https://www.bromite.org/
+##
+#
+
+if [ ! $# -eq 1 ]; then
+	echo "Usage: install-deps.sh release" 1>&2
+	exit 1
+fi
+
+RELEASE="$1"
+
+## sudo= commands run in fdroiddata/
+
+set -e
+
+## the main srclib must already be present
+cd build/srclib/chromium
+
+git checkout "$RELEASE"
+
+## remove some deps that fail due to jessie-backports
+#for DEP in libcups2-dev libdrm-dev libgl1-mesa-dev libgles2-mesa-dev libglib2.0-dev libpulse-dev libssl-dev libudev-dev; do
+#	sed -i "s~^  $DEP\$~~" build/install-build-deps.sh
+#done
+
+## to fix the "E: no packages found" error
+apt-get update
+
+## accept the license for the MS core fonts - installed by Chromium's install deps script
+echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
+## do not ask questions during installations - always assume yes
+echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+exec build/install-build-deps-android.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+## sync.sh
+##
+## @author csagan5
+##
+## Bromite 'gclient sync' script for F-Droid
+## https://www.bromite.org/
+##
+#
+
+set -e
+
+## sync= commands run in fdroiddata/build/$PKG
+
+. common
+
+## install gclient configuration files
+cp gclient_android.default ../../srclib/.gclient
+cp gclient_entries         ../../srclib/.gclient_entries
+
+## create all necessary srclib symlinks so that gclient does not fetch them again
+cd ../../srclib
+../$PKG/fdroid/gclient-prepare.sh
+
+## gclient must run in the chromium directory and it cannot be a symlink
+cd src
+
+set +e
+#gclient sync --with_branch_heads --delete_unversioned_trees
+echo y | gclient sync --reset
+RV=$?
+
+
+if [ $RV -eq 0 ]; then
+	cd ..
+	## success, copy the new gclient_entries
+	cp .gclient_entries ../$PKG/fdroid/gclient_entries
+	exit 0
+fi
+
+exit $RV
@@ -1,32 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 18 May 2018 10:10:00 +0200
-Subject: Increase maximum connections per host from 6 to 15
-
---
- net/socket/client_socket_pool_manager.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
--- a/net/socket/client_socket_pool_manager.cc
-+++ b/net/socket/client_socket_pool_manager.cc
-@@ -34,7 +34,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
-                   HttpNetworkSession::NUM_SOCKET_POOL_TYPES,
-               "max sockets per pool length mismatch");
- 
-// Default to allow up to 6 connections per host. Experiment and tuning may
-+// Default to allow up to 15 connections per host. Experiment and tuning may
- // try other values (greater than 0).  Too large may cause many problems, such
- // as home routers blocking the connections!?!?  See http://crbug.com/12066.
- //
-@@ -43,7 +43,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
- // be the same as the limit for ws. Also note that Firefox uses a limit of 200.
- // See http://crbug.com/486800
- int g_max_sockets_per_group[] = {
-    6,   // NORMAL_SOCKET_POOL
-+    15,  // NORMAL_SOCKET_POOL
-     255  // WEBSOCKET_SOCKET_POOL
- };
- 
-- 
-2.7.4
-
@@ -1,26 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 26 Nov 2017 11:40:05 +0100
-Subject: Restore classic new tab page
-
---
- chrome/browser/search/search.cc | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
--- a/chrome/browser/search/search.cc
-+++ b/chrome/browser/search/search.cc
-@@ -155,10 +155,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
- }
- 
- bool ShouldShowLocalNewTab(Profile* profile) {
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  return command_line->HasSwitch(switches::kForceLocalNtp) ||
-         (base::FeatureList::IsEnabled(features::kUseGoogleLocalNtp) &&
-          profile && DefaultSearchProviderIsGoogle(profile));
-+  return true;
- }
- 
- bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
-- 
-2.7.4
-
@@ -1,35 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 9 Nov 2014 01:54:27 +0100
-Subject: promo: disable Google promotion fetching
-
-Documentation is scarce, and sprinkled with misleading acronyms.
-NTP is not NTP, for example. FWIW:
-
-// A PromoResourceService fetches data from a web resource server to
-// be used to dynamically change the appearance of the New Tab Page.
-// For example, it has been used to fetch "tips" to be displayed on
-// the NTP, or to display promotional messages to certain groups of
-// Chrome users.
-
-Whatever it is that it downloads, deactivate the one that leads to
-Google.
-
-References: https://github.com/iridium-browser/iridium-browser/issues/33
---
- chrome/browser/signin/signin_promo.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
--- a/chrome/browser/signin/signin_promo.cc
-+++ b/chrome/browser/signin/signin_promo.cc
-@@ -130,6 +130,7 @@ namespace signin {
- 
- bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
-   DCHECK(profile);
-+  return false;
- 
-   // Don't show if the profile is an incognito.
-   if (profile->IsOffTheRecord())
-- 
-2.7.4
-
@@ -1,34 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 23:24:58 +0200
-Subject: Disables omission of URL elements in Omnibox
-
-Disable all omissions (already shadowed by first flag)
---
- components/url_formatter/url_formatter.cc | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
--- a/components/url_formatter/url_formatter.cc
-+++ b/components/url_formatter/url_formatter.cc
-@@ -402,12 +402,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
- }  // namespace
- 
- const FormatUrlType kFormatUrlOmitNothing = 0;
-const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
-const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
-+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
-+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
-+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
-+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
-+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
- 
- const FormatUrlType kFormatUrlOmitDefaults =
-     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
-- 
-2.7.4
-
@@ -1,88 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 26 Nov 2017 22:51:43 +0100
-Subject: Skip the first run and metrics
-
---
- .../chrome/browser/firstrun/FirstRunStatus.java        |  8 ++++----
- .../chrome/browser/firstrun/FirstRunUtils.java         | 16 ++++++----------
- .../browser/firstrun/ToSAndUMAFirstRunFragment.java    | 18 ++++++------------
- 3 files changed, 16 insertions(+), 26 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
-@@ -36,11 +36,11 @@ public class FirstRunStatus {
-      * includes ToS and Sign In pages if necessary.
-      */
-     public static boolean getFirstRunFlowComplete() {
-        if (ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false)) {
-            return true;
-+        boolean complete = ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
-+        if (!complete) {
-+             setFirstRunFlowComplete(true);
-         }
-        return CommandLine.getInstance().hasSwitch(
-                ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
-+        return true;
-     }
- 
-     /**
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
-@@ -30,16 +30,12 @@ public class FirstRunUtils {
-         //   - checkAnyUserHasSeenToS() may be true which needs to sync its state to the prefs.
-         boolean javaPrefValue = javaPrefs.getBoolean(CACHED_TOS_ACCEPTED_PREF, false);
-         boolean nativePrefValue = prefsBridge.isFirstRunEulaAccepted();
-        boolean userHasSeenTos =
-                ToSAckedReceiver.checkAnyUserHasSeenToS();
-        boolean isFirstRunComplete = FirstRunStatus.getFirstRunFlowComplete();
-        if (javaPrefValue || nativePrefValue || userHasSeenTos || isFirstRunComplete) {
-            if (!javaPrefValue) {
-                javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
-            }
-            if (!nativePrefValue) {
-                prefsBridge.setEulaAccepted();
-            }
-+
-+        if (!javaPrefValue) {
-+            javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
-+        }
-+        if (!nativePrefValue) {
-+            prefsBridge.setEulaAccepted();
-         }
-     }
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
-             }
-         });
- 
-        if (ChromeVersionInfo.isOfficialBuild()) {
-            int paddingStart = getResources().getDimensionPixelSize(
-                    R.dimen.fre_tos_checkbox_padding);
-            ApiCompatibilityUtils.setPaddingRelative(mSendReportCheckBox,
-                    ApiCompatibilityUtils.getPaddingStart(mSendReportCheckBox) + paddingStart,
-                    mSendReportCheckBox.getPaddingTop(),
-                    ApiCompatibilityUtils.getPaddingEnd(mSendReportCheckBox),
-                    mSendReportCheckBox.getPaddingBottom());
-
-            mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
-        } else {
-            mSendReportCheckBox.setVisibility(View.GONE);
-+        int paddingStart = getResources().getDimensionPixelSize(R.dimen.fre_tos_checkbox_padding);
-+        if (paddingStart != 0) {
-+            mSendReportCheckBox.setChecked(false);
-         }
- 
-+        mSendReportCheckBox.setChecked(false);
-+        mSendReportCheckBox.setVisibility(View.GONE);
-+
-         mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
- 
-         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan() {
-- 
-2.7.4
-
@@ -1,220 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 14:23:07 +0200
-Subject: Disable signin and data saver preferences
-
-Never show the data saver promo snackbar
---
- chrome/android/java/res/xml/main_preferences.xml   |  8 +++---
- .../chromium/chrome/browser/ChromeActivity.java    |  6 ++--
- .../browser/preferences/MainPreferences.java       | 32 ++++++++++++----------
- 3 files changed, 26 insertions(+), 20 deletions(-)
-
-diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
-+++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -6,10 +6,10 @@
- <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-     android:orderingFromXml="false">
- 
-    <org.chromium.chrome.browser.preferences.SignInPreference
-+    <!-- org.chromium.chrome.browser.preferences.SignInPreference
-         android:key="sign_in"
-         android:order="0"
-        android:title="@string/sign_in_to_chrome"/>
-+        android:title="@string/sign_in_to_chrome"/-->
- 
-     <PreferenceCategory
-         android:key="basics_section"
-@@ -70,11 +70,11 @@
-         android:key="languages"
-         android:order="12"
-         android:title="@string/prefs_languages"/>
-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
-+    <!-- org.chromium.chrome.browser.preferences.ChromeBasePreference
-         android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
-         android:key="data_reduction"
-         android:order="13"
-        android:title="@string/data_reduction_title"/>
-+        android:title="@string/data_reduction_title"/-->
-     <org.chromium.chrome.browser.preferences.ChromeBasePreference
-         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
-         android:key="downloads"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -114,7 +114,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.share.ShareMenuActionHandler;
- import org.chromium.chrome.browser.snackbar.BottomContainer;
-import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
-+//import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
- import org.chromium.chrome.browser.snackbar.DataUseSnackbarController;
- import org.chromium.chrome.browser.snackbar.SnackbarManager;
- import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
-@@ -255,7 +255,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-     private SnackbarManager mSnackbarManager;
-     private ModalDialogManager mModalDialogManager;
-     private DataUseSnackbarController mDataUseSnackbarController;
-    private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
-+    //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
-     private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate;
-     private AppMenuHandler mAppMenuHandler;
-     private ToolbarManager mToolbarManager;
-@@ -576,6 +576,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-                     mDataUseSnackbarController.showDataUseTrackingEndedBar();
-                 }
- 
-+/*
-                 // Only alert about data savings once the first paint has happened. It doesn't make
-                 // sense to show a snackbar about savings when nothing has been displayed yet.
-                 if (DataReductionProxySettings.getInstance().isSnackbarPromoAllowed(tab.getUrl())) {
-@@ -588,6 +589,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-                             DataReductionProxySettings.getInstance()
-                                     .getTotalHttpContentLengthSaved());
-                 }
-+*/
-             }
- 
-             @Override
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-@@ -18,9 +18,9 @@ import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
- import org.chromium.chrome.browser.autofill.PersonalDataManager;
- import org.chromium.chrome.browser.contextual_suggestions.EnabledStateMonitor;
-import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
-+//import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
-import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
-+//import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
- import org.chromium.chrome.browser.search_engines.TemplateUrlService;
- import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
- import org.chromium.chrome.browser.signin.SigninManager;
-@@ -35,20 +35,20 @@ import java.util.Map;
-  */
- public class MainPreferences extends PreferenceFragment
-         implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener {
-    public static final String PREF_SIGN_IN = "sign_in";
-+    //public static final String PREF_SIGN_IN = "sign_in";
-     public static final String PREF_AUTOFILL_SETTINGS = "autofill_settings";
-     public static final String PREF_SEARCH_ENGINE = "search_engine";
-     public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
-     public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions";
-     public static final String PREF_HOMEPAGE = "homepage";
-    public static final String PREF_DATA_REDUCTION = "data_reduction";
-+    //public static final String PREF_DATA_REDUCTION = "data_reduction";
-     public static final String PREF_NOTIFICATIONS = "notifications";
-     public static final String PREF_LANGUAGES = "languages";
-     public static final String PREF_DOWNLOADS = "downloads";
- 
-     private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
-     private final Map<String, Preference> mAllPreferences = new HashMap<>();
-    private SignInPreference mSignInPreference;
-+    //private SignInPreference mSignInPreference;
- 
-     public MainPreferences() {
-         setHasOptionsMenu(true);
-@@ -64,25 +64,29 @@ public class MainPreferences extends PreferenceFragment
-     @Override
-     public void onDestroy() {
-         super.onDestroy();
-        mSignInPreference.onPreferenceFragmentDestroyed();
-+        //mSignInPreference.onPreferenceFragmentDestroyed();
-     }
- 
-     @Override
-     public void onStart() {
-         super.onStart();
-+/*
-         if (SigninManager.get().isSigninSupported()) {
-             SigninManager.get().addSignInStateObserver(this);
-             mSignInPreference.registerForUpdates();
-         }
-+*/
-     }
- 
-     @Override
-     public void onStop() {
-         super.onStop();
-+/*
-         if (SigninManager.get().isSigninSupported()) {
-             SigninManager.get().removeSignInStateObserver(this);
-             mSignInPreference.unregisterForUpdates();
-         }
-+*/
-     }
- 
-     @Override
-@@ -98,7 +102,7 @@ public class MainPreferences extends PreferenceFragment
-         setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
-         setManagedPreferenceDelegateForPreference(PREF_AUTOFILL_SETTINGS);
-         setManagedPreferenceDelegateForPreference(PREF_SAVED_PASSWORDS);
-        setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
-+        //setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
- 
-         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-             // If we are on Android O+ the Notifications preference should lead to the Android
-@@ -154,7 +158,7 @@ public class MainPreferences extends PreferenceFragment
-             Preference preference = getPreferenceScreen().getPreference(index);
-             mAllPreferences.put(preference.getKey(), preference);
-         }
-        mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
-+        //mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
-     }
- 
-     private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -163,12 +167,6 @@ public class MainPreferences extends PreferenceFragment
-     }
- 
-     private void updatePreferences() {
-        if (SigninManager.get().isSigninSupported()) {
-            addPreferenceIfAbsent(PREF_SIGN_IN);
-        } else {
-            removePreferenceIfPresent(PREF_SIGN_IN);
-        }
-
-         updateSearchEnginePreference();
- 
-         if (HomepageManager.shouldShowHomepageSetting()) {
-@@ -187,9 +185,11 @@ public class MainPreferences extends PreferenceFragment
-             removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS);
-         }
- 
-+/*
-         ChromeBasePreference dataReduction =
-                 (ChromeBasePreference) findPreference(PREF_DATA_REDUCTION);
-         dataReduction.setSummary(DataReductionPreferences.generateSummary(getResources()));
-+*/
-     }
- 
-     private Preference addPreferenceIfAbsent(String key) {
-@@ -260,9 +260,11 @@ public class MainPreferences extends PreferenceFragment
-                 if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) {
-                     return PrefServiceBridge.getInstance().isRememberPasswordsManaged();
-                 }
-+/*
-                 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
-                     return DataReductionProxySettings.getInstance().isDataReductionProxyManaged();
-                 }
-+*/
-                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
-                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
-                 }
-@@ -280,11 +282,13 @@ public class MainPreferences extends PreferenceFragment
-                     return prefs.isRememberPasswordsManaged()
-                             && !prefs.isRememberPasswordsEnabled();
-                 }
-+/*
-                 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
-                     DataReductionProxySettings settings = DataReductionProxySettings.getInstance();
-                     return settings.isDataReductionProxyManaged()
-                             && !settings.isDataReductionProxyEnabled();
-                 }
-+*/
-                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
-                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
-                 }
-- 
-2.7.4
-
@@ -1,32 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 15:09:26 +0200
-Subject: Disable signin/data reduction promos
-
---
- .../java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java    | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -562,7 +562,7 @@ public class ChromeTabbedActivity
-             // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
-             //                might not have completed at this point and we could show multiple
-             //                promos.
-            boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
-+            /*boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
-             // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696
-             boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
-             if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
-@@ -581,7 +581,7 @@ public class ChromeTabbedActivity
-                 preferenceManager.setPromosSkippedOnFirstStart(true);
-             }
- 
-            if (!isShowingPromo) {
-+            if (!isShowingPromo) */ {
-                 final Tracker tracker =
-                         TrackerFactory.getTrackerForProfile(Profile.getLastUsedProfile());
-                 tracker.addOnInitializedCallback(
-- 
-2.7.4
-
@@ -1,156 +0,0 @@
-From: Serg <serg.zhukovsky@gmail.com>
-Date: Wed, 22 Mar 2017 19:10:30 -0400
-Subject: Removed Sync and Translate menu
-
---
- .../java/res/drawable-hdpi/settings_translate.png  | Bin 399 -> 0 bytes
- .../java/res/drawable-mdpi/settings_translate.png  | Bin 284 -> 0 bytes
- .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes
- .../res/drawable-xxhdpi/settings_translate.png     | Bin 793 -> 0 bytes
- .../res/drawable-xxxhdpi/settings_translate.png    | Bin 1038 -> 0 bytes
- .../java/res/xml/site_settings_preferences.xml     |   8 +++----
- .../website/SiteSettingsPreferences.java           |  26 ++++++++++-----------
- 7 files changed, 17 insertions(+), 17 deletions(-)
- delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
- delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
- delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
- delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png
- delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
-
-diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png
-deleted file mode 100644
-diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png
-deleted file mode 100644
-diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png
-deleted file mode 100644
-diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png
-deleted file mode 100644
-diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
-deleted file mode 100644
-diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
--- a/chrome/android/java/res/xml/site_settings_preferences.xml
-+++ b/chrome/android/java/res/xml/site_settings_preferences.xml
-@@ -44,9 +44,9 @@
-         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
-         android:key="ads" />
-     <!-- Background sync -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
-+    <!--<org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
-         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
-        android:key="background_sync" />
-+        android:key="background_sync" />-->
-     <!-- Protected content -->
-     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
-         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
-@@ -66,11 +66,11 @@
-         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
-         android:key="sound" />
-     <!-- Google Translate -->
-    <Preference
-+    <!-- <Preference
-         android:fragment="org.chromium.chrome.browser.preferences.website.TranslatePreferences"
-         android:key="translate"
-         android:title="@string/google_translate"
-        android:icon="@drawable/settings_translate" />
-+        android:icon="@drawable/settings_translate" />-->
-     <!-- Storage -->
-     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
-     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-@@ -38,7 +38,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
-     static final String ALL_SITES_KEY = "all_sites";
-     static final String ADS_KEY = "ads";
-     static final String AUTOPLAY_KEY = "autoplay";
-    static final String BACKGROUND_SYNC_KEY = "background_sync";
-+    //static final String BACKGROUND_SYNC_KEY = "background_sync";
-     static final String CAMERA_KEY = "camera";
-     static final String CLIPBOARD_KEY = "clipboard";
-     static final String COOKIES_KEY = "cookies";
-@@ -51,7 +51,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
-     static final String PROTECTED_CONTENT_KEY = "protected_content";
-     static final String SOUND_KEY = "sound";
-     static final String STORAGE_KEY = "use_storage";
-    static final String TRANSLATE_KEY = "translate";
-+    //static final String TRANSLATE_KEY = "translate";
-     static final String USB_KEY = "usb";
- 
-     // Whether the Protected Content menu is available for display.
-@@ -86,8 +86,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
-             return ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS;
-         } else if (AUTOPLAY_KEY.equals(key)) {
-             return ContentSettingsType.CONTENT_SETTINGS_TYPE_AUTOPLAY;
-        } else if (BACKGROUND_SYNC_KEY.equals(key)) {
-            return ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;
-+        /*} else if (BACKGROUND_SYNC_KEY.equals(key)) {
-+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;*/
-         } else if (CAMERA_KEY.equals(key)) {
-             return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
-         } else if (CLIPBOARD_KEY.equals(key)) {
-@@ -118,7 +118,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
-             // menus.
-             getPreferenceScreen().removePreference(findPreference(ALL_SITES_KEY));
-             getPreferenceScreen().removePreference(findPreference(ADS_KEY));
-            getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
-+            //getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
-             getPreferenceScreen().removePreference(findPreference(CAMERA_KEY));
-             getPreferenceScreen().removePreference(findPreference(CLIPBOARD_KEY));
-             getPreferenceScreen().removePreference(findPreference(COOKIES_KEY));
-@@ -130,7 +130,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
-             getPreferenceScreen().removePreference(findPreference(POPUPS_KEY));
-             getPreferenceScreen().removePreference(findPreference(SOUND_KEY));
-             getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));
-            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
-+            //getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
-             getPreferenceScreen().removePreference(findPreference(USB_KEY));
-         } else {
-             // If both Autoplay and Protected Content menus are available, they'll be tucked under
-@@ -156,9 +156,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
-             }
-             // The new Languages Preference *feature* is an advanced version of this translate
-             // preference. Once Languages Preference is enabled, remove this setting.
-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
-+            /*if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
-                 getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
-            }
-+            }*/
-         }
-     }
- 
-@@ -166,10 +166,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
-         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
- 
-         // Translate preference.
-        Preference translatePref = findPreference(TRANSLATE_KEY);
-+        /*Preference translatePref = findPreference(TRANSLATE_KEY);
-         if (translatePref != null) {
-             setTranslateStateSummary(translatePref);
-        }
-+        }*/
- 
-         // Preferences that navigate to Website Settings.
-         List<String> websitePrefs = new ArrayList<String>();
-@@ -183,7 +183,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
-             // When showing the main menu, if Protected Content is not available, only Autoplay
-             // will be visible.
-             if (!mProtectedContentMenuAvailable) websitePrefs.add(AUTOPLAY_KEY);
-            websitePrefs.add(BACKGROUND_SYNC_KEY);
-+            //websitePrefs.add(BACKGROUND_SYNC_KEY);
-             websitePrefs.add(CAMERA_KEY);
-             if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
-                 websitePrefs.add(CLIPBOARD_KEY);
-@@ -208,8 +208,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
-                 checked = PrefServiceBridge.getInstance().adsEnabled();
-             } else if (AUTOPLAY_KEY.equals(prefName)) {
-                 checked = PrefServiceBridge.getInstance().isAutoplayEnabled();
-            } else if (BACKGROUND_SYNC_KEY.equals(prefName)) {
-                checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();
-+            /*} else if (BACKGROUND_SYNC_KEY.equals(prefName)) {
-+                checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();*/
-             } else if (CAMERA_KEY.equals(prefName)) {
-                 checked = PrefServiceBridge.getInstance().isCameraEnabled();
-             } else if (CLIPBOARD_KEY.equals(prefName)) {
-- 
-2.7.4
-
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 26 Nov 2017 23:11:56 +0100
-Subject: Disable Omaha update checks
-
---
- .../android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -132,7 +132,7 @@ public class OmahaBase {
- 
-     /** See {@link #sIsDisabled}. */
-     static boolean isDisabled() {
-        return sIsDisabled;
-+        return true;
-     }
- 
-     /**
-- 
-2.7.4
-
@@ -1,714 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 18 Oct 2017 21:24:05 +0200
-Subject: Add StartPage search engine
-
---
- .../search_engines/prepopulated_engines.json       |  12 +-
- components/search_engines/search_engine_type.h     |   1 +
- .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 121 insertions(+), 110 deletions(-)
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -32,7 +32,7 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
-    "kCurrentDataVersion": 100
-+    "kCurrentDataVersion": 101
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -232,6 +232,16 @@
-       "id": 56
-     },
- 
-+    "startpage": {
-+      "name": "StartPage",
-+      "keyword": "startpage.com",
-+      "favicon_url": "https://www.startpage.com/graphics/favicon/sp-favicon-16x16.png",
-+      "search_url": "https://www.startpage.com/do/dsearch?query={searchTerms}&cat=web&pl=opensearch",
-+      "suggest_url": "https://www.startpage.com/cgi-bin/csuggest?query={searchTerms}&limit=10&format=json",
-+      "type": "SEARCH_ENGINE_STARTPAGE",
-+      "id": 33
-+    },
-+
-     "vinden": {
-       "name": "Vinden.nl",
-       "keyword": "vinden.nl",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
--- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -65,6 +65,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_360,
-   SEARCH_ENGINE_DUCKDUCKGO,
-   SEARCH_ENGINE_DUCKDUCKGOLIGHT,
-+  SEARCH_ENGINE_STARTPAGE,
-   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
- };
- 
-diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &google, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &seznam, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &google, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &naver, &daum,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &google, &duckduckgo, &duckduckgo_light, &onet, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &google, &duckduckgo, &duckduckgo_light, &najdi, &ask,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &google, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
-+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
- };
- 
- // A list of all the engines that we know about.
- const PrepopulatedEngine* const kAllEngines[] = {
-     // Prepopulated engines:
-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &duckduckgo_light, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
-     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
-     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
-     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
-- 
-2.7.4
-
@@ -1,727 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 11 Dec 2017 22:42:11 +0100
-Subject: Add Google English-only engine
-
-Add a Google search engine that forces languages to English,
-disable from all its searches RLZ and field experiments querystring parameters.
---
- .../search_engines/prepopulated_engines.json       |  23 ++-
- components/search_engines/search_engine_type.h     |   1 +
- .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 132 insertions(+), 110 deletions(-)
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -32,7 +32,7 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
-    "kCurrentDataVersion": 101
-+    "kCurrentDataVersion": 102
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -154,6 +154,27 @@
-       "id": 1
-     },
- 
-+    "googleen": {
-+      "name": "Google in English",
-+      "keyword": "googleen",
-+      "favicon_url": "https://www.google.com/favicon.ico",
-+      "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en",
-+      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en",
-+      "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
-+      "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
-+      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
-+      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
-+      "alternate_urls": [
-+        "{google:baseURL}?hl=en#q={searchTerms}",
-+        "{google:baseURL}search?hl=en#q={searchTerms}",
-+        "{google:baseURL}webhp?hl=en#q={searchTerms}",
-+        "{google:baseURL}s?hl=en#q={searchTerms}",
-+        "{google:baseURL}s?hl=en&q={searchTerms}"
-+      ],
-+      "type": "SEARCH_ENGINE_GOOGLE_EN",
-+      "id": 13
-+    },
-+
-     "kvasir": {
-       "name": "Kvasir",
-       "keyword": "kvasir.no",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
--- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -66,6 +66,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_DUCKDUCKGO,
-   SEARCH_ENGINE_DUCKDUCKGOLIGHT,
-   SEARCH_ENGINE_STARTPAGE,
-+  SEARCH_ENGINE_GOOGLE_EN,
-   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
- };
- 
-diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
- };
- 
- // A list of all the engines that we know about.
- const PrepopulatedEngine* const kAllEngines[] = {
-     // Prepopulated engines:
-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
-     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
-     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
-     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
-- 
-2.7.4
-
@@ -1,715 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Mar 2018 20:31:44 +0100
-Subject: Add Qwant search engine
-
---
- .../search_engines/prepopulated_engines.json       |  13 +-
- components/search_engines/search_engine_type.h     |   1 +
- .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 122 insertions(+), 110 deletions(-)
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -32,7 +32,7 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
-    "kCurrentDataVersion": 102
-+    "kCurrentDataVersion": 103
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -939,6 +939,17 @@
-       "id": 6
-     },
- 
-+    "qwant": {
-+      "name": "Qwant",
-+      "keyword": "qwant.com",
-+      "favicon_url": "https://www.qwant.com/favicon.ico",
-+      "search_url": "https://www.qwant.com/?client=opensearch&q={searchTerms}",
-+      "suggest_url": "https://api.qwant.com/api/suggest/?client=opensearch&q={searchTerms}",
-+      "image_url": "https://www.qwant.com/?t=images&q={searchTerms}",
-+      "type": "SEARCH_ENGINE_QWANT",
-+      "id": 14
-+    },
-+
-     "rambler": {
-       "name": "\u0420\u0430\u043c\u0431\u043b\u0435\u0440",
-       "keyword": "rambler.ru",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
--- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -67,6 +67,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_DUCKDUCKGOLIGHT,
-   SEARCH_ENGINE_STARTPAGE,
-   SEARCH_ENGINE_GOOGLE_EN,
-+  SEARCH_ENGINE_QWANT,
-   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
- };
- 
-diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
-+    &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
- };
- 
- // A list of all the engines that we know about.
- const PrepopulatedEngine* const kAllEngines[] = {
-     // Prepopulated engines:
-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &qwant, &duckduckgo, &duckduckgo_light, &kvasir,
-     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
-     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
-     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
-- 
-2.7.4
-
@@ -1,24 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 20 Jan 2018 19:44:43 +0100
-Subject: Fix crash when accessing page info / site settings
-
---
- chrome/browser/permissions/permission_manager.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
--- a/chrome/browser/permissions/permission_manager.cc
-+++ b/chrome/browser/permissions/permission_manager.cc
-@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-   GURL canonical_requesting_origin =
-       GetCanonicalOrigin(requesting_origin, embedding_origin);
-   PermissionContextBase* context = GetPermissionContext(permission);
-+  if (context == nullptr) {
-+      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
-+  }
-   PermissionResult result = context->GetPermissionStatus(
-       render_frame_host, canonical_requesting_origin.GetOrigin(),
-       embedding_origin.GetOrigin());
-- 
-2.7.4
-
@@ -1,109 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 20 Jan 2018 21:17:27 +0100
-Subject: openH264: enable ARM/ARM64 optimizations
-
-Enable the optimizations not only for ChromeOS but for all compatbile ARM/ARM64 architectures
-Limit threads auto-detect only for iOS
---
- content/renderer/media_recorder/h264_encoder.cc |  6 ++--
- third_party/openh264/BUILD.gn                   | 39 +++++++++++++++++++++++++
- 2 files changed, 42 insertions(+), 3 deletions(-)
-
-diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
--- a/content/renderer/media_recorder/h264_encoder.cc
-+++ b/content/renderer/media_recorder/h264_encoder.cc
-@@ -149,11 +149,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
-     init_params.iRCMode = RC_OFF_MODE;
-   }
- 
-#if defined(OS_CHROMEOS)
-  init_params.iMultipleThreadIdc = 0;
-#else
-+#if defined(OS_MACOSX)
-   // Threading model: Set to 1 due to https://crbug.com/583348.
-   init_params.iMultipleThreadIdc = 1;
-+#else
-+  init_params.iMultipleThreadIdc = 0;
- #endif
- 
-   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
-diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
--- a/third_party/openh264/BUILD.gn
-+++ b/third_party/openh264/BUILD.gn
-@@ -10,6 +10,7 @@ import("//third_party/yasm/yasm_assemble.gni")
- # Config shared by all openh264 targets.
- config("config") {
-   cflags = []
-+  defines = []
- 
-   if (is_chromeos && target_cpu == "arm") {
-     # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
-@@ -20,6 +21,20 @@ config("config") {
-     ]
-   }
- 
-+  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
-+  # devices.
-+  if (is_chromeos && target_cpu == "arm") {
-+    defines += [
-+      "__chromeos__",
-+    ]
-+  }
-+
-+  if (target_cpu == "arm" || target_cpu == "arm64") {
-+    defines += [
-+      "HAVE_NEON",
-+    ]
-+  }
-+
-   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
-   if (!is_win || is_clang) {
-     cflags += [
-@@ -128,6 +143,14 @@ source_set("common") {
-   }
-   include_dirs = openh264_common_include_dirs
- 
-+  # enable ARM optimizations
-+  if (target_cpu == "arm") {
-+    sources += openh264_common_sources_asm_arm
-+  }
-+  if (target_cpu == "arm64") {
-+    sources += openh264_common_sources_asm_arm64
-+  }
-+
-   configs -= [ "//build/config/compiler:chromium_code" ]
-   configs += [ "//build/config/compiler:no_chromium_code" ]
-   configs += [ ":config" ]
-@@ -154,6 +177,14 @@ source_set("processing") {
-   }
-   include_dirs = openh264_processing_include_dirs
- 
-+  # enable ARM optimizations
-+  if (target_cpu == "arm") {
-+    sources += openh264_common_sources_asm_arm
-+  }
-+  if (target_cpu == "arm64") {
-+    sources += openh264_common_sources_asm_arm64
-+  }
-+
-   configs -= [ "//build/config/compiler:chromium_code" ]
-   configs += [ "//build/config/compiler:no_chromium_code" ]
-   configs += [ ":config" ]
-@@ -173,6 +204,14 @@ source_set("encoder") {
-   }
-   include_dirs = openh264_encoder_include_dirs
- 
-+  # enable ARM optimizations
-+  if (target_cpu == "arm") {
-+    sources += openh264_common_sources_asm_arm
-+  }
-+  if (target_cpu == "arm64") {
-+    sources += openh264_common_sources_asm_arm64
-+  }
-+
-   configs -= [ "//build/config/compiler:chromium_code" ]
-   configs += [ "//build/config/compiler:no_chromium_code" ]
-   configs += [ ":config" ]
-- 
-2.7.4
-
@@ -1,74 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 28 Oct 2017 10:09:41 +0200
-Subject: Cure AMP and tracking from search results
-
---
- third_party/blink/renderer/core/dom/BUILD.gn         |  1 +
- third_party/blink/renderer/core/dom/document.cc      | 20 +++++++++++++++++++-
- .../renderer/core/dom/extensions/anti_amp_cure.h     |  6 ++++++
- 3 files changed, 26 insertions(+), 1 deletion(-)
- create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
-
-diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
--- a/third_party/blink/renderer/core/dom/BUILD.gn
-+++ b/third_party/blink/renderer/core/dom/BUILD.gn
-@@ -147,6 +147,7 @@ blink_core_sources("dom") {
-     "events/tree_scope_event_context.h",
-     "events/window_event_context.cc",
-     "events/window_event_context.h",
-+    "extensions/dont-track-me.h",
-     "exception_code.h",
-     "first_letter_pseudo_element.cc",
-     "first_letter_pseudo_element.h",
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -276,6 +276,8 @@
- #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
- #include "third_party/blink/renderer/platform/wtf/time.h"
- 
-+#include "extensions/anti_amp_cure.h"
-+
- #ifndef NDEBUG
- using WeakDocumentSet =
-     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
-@@ -5839,8 +5841,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
-  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  const SecurityOrigin *origin = GetSecurityOrigin();
-+  if (origin) {
-+    WTF::String domain = origin->Domain();
-+    size_t pos = domain.Find(".google.");
-+    auto* bodyElement = body();
-+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-+      e->setText(ANTI_AMP_CURE_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  }
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
-new file mode 100644
--- /dev/null
-+++ b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
-@@ -0,0 +1,6 @@
-+#ifndef anti_amp_cure_h
-+#define anti_amp_cure_h
-+
-+#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks(document));\n}\n\nfunction hookMoreResults() {\n      var extrares = document.getElementById('extrares');\n      if (!extrares) {\n         console.log(\"could not hook more results\");\n         return;\n      }\n      // mutation observers are great but they don't work\n      extrares.addEventListener(\"DOMNodeInserted\", function(e) {\n         var node = e.target;\n         if (node.id && node.id.startsWith(\"arc-srp\"))\n             console.log(\"hyperlinks sanitized on new result node: \", sanitizeAllHyperlinks(node));\n      });\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('qslc');\n      if (mlogo && mlogo.children[0]) {\n        mlogo = mlogo.children[0];\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks(rootNode) {\n    var saned = 0, total = 0;\n    rootNode.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n    sanitizeAll();\n}\nsetMlogoClick();\n\nhookMoreResults();\n"
-+
-+#endif  // anti_amp_cure_h
-- 
-2.7.4
-
@@ -1,24 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:43:35 +0100
-Subject: Never send any crash upload data
-
---
- chrome/browser/tracing/crash_service_uploader.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
--- a/chrome/browser/tracing/crash_service_uploader.cc
-+++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -122,6 +122,9 @@ void TraceCrashServiceUploader::DoUpload(
-     std::unique_ptr<const base::DictionaryValue> metadata,
-     const UploadProgressCallback& progress_callback,
-     const UploadDoneCallback& done_callback) {
-+
-+  return;
-+
-   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- 
-   progress_callback_ = progress_callback;
-- 
-2.7.4
-
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 15:03:29 +0200
-Subject: Hide "Send reports to Google"
-
---
- chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
--- a/chrome/android/java/res/layout/fre_tosanduma.xml
-+++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -70,7 +70,7 @@
-                         android:layout_height="wrap_content"
-                         android:lineSpacingMultiplier="1.4"
-                         android:text="@string/fre_send_report_check"
-                        android:textAppearance="@style/BlackBodyDefault" />
-+                        android:textAppearance="@style/BlackBodyDefault" android:visibility = "gone" />
-                     </LinearLayout>
-             </LinearLayout>
-         </LinearLayout>
-- 
-2.7.4
-
@@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 14 Feb 2018 12:56:01 +0100
-Subject: Never fetch popular sites
-
---
- components/ntp_tiles/popular_sites_impl.cc | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
--- a/components/ntp_tiles/popular_sites_impl.cc
-+++ b/components/ntp_tiles/popular_sites_impl.cc
-@@ -289,6 +289,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
-   DCHECK(!callback_);
-   callback_ = callback;
- 
-+  if (force_download) {
-+    callback_.Run(true);
-+    return true;
-+  }
-+  return false;
-+
-   const base::Time last_download_time = base::Time::FromInternalValue(
-       prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
-   const base::TimeDelta time_since_last_download =
-- 
-2.7.4
-
@@ -1,56 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:14:39 +0100
-Subject: ungoogled-chromium: Disable signin
-
---
- chrome/browser/ui/chrome_pages.cc                     | 8 ++------
- components/signin/core/browser/signin_manager_base.cc | 2 +-
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
--- a/chrome/browser/ui/chrome_pages.cc
-+++ b/chrome/browser/ui/chrome_pages.cc
-@@ -77,12 +77,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
-   ShowSingletonTabOverwritingNTP(browser, params);
- }
- 
-void NavigateToSingletonTab(Browser* browser, const GURL& url) {
-  NavigateParams params(GetSingletonTabNavigateParams(browser, url));
-  params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
-  ShowSingletonTabOverwritingNTP(browser, params);
-}
-
- // Shows either the help app or the appropriate help page for |source|. If
- // |browser| is NULL and the help page is used (vs the app), the help page is
- // shown in the last active browser. If there is no such browser, a new browser
-@@ -397,6 +391,7 @@ void ShowSearchEngineSettings(Browser* browser) {
- #if !defined(OS_ANDROID)
- void ShowBrowserSignin(Browser* browser,
-                        signin_metrics::AccessPoint access_point) {
-+#if 0
-   Profile* original_profile = browser->profile()->GetOriginalProfile();
-   SigninManagerBase* manager =
-       SigninManagerFactory::GetForProfile(original_profile);
-@@ -442,6 +437,7 @@ void ShowBrowserSignin(Browser* browser,
-         BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
-         signin::ManageAccountsParams(), access_point, false);
-   }
-+#endif 
- }
- 
- void ShowBrowserSigninOrSettings(Browser* browser,
-diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc
--- a/components/signin/core/browser/signin_manager_base.cc
-+++ b/components/signin/core/browser/signin_manager_base.cc
-@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
- bool SigninManagerBase::IsInitialized() const { return initialized_; }
- 
- bool SigninManagerBase::IsSigninAllowed() const {
-  return client_->GetPrefs()->GetBoolean(prefs::kSigninAllowed);
-+  return false;
- }
- 
- AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
-- 
-2.7.4
-
@@ -1,56 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:21:36 +0100
-Subject: ungoogled-chromium: Disable webRTC log uploader
-
---
- chrome/browser/media/webrtc/webrtc_log_uploader.cc | 28 ++++------------------
- 1 file changed, 4 insertions(+), 24 deletions(-)
-
-diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -115,30 +115,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
-   DCHECK(meta_data.get());
-   DCHECK(!upload_done_data.log_path.empty());
- 
-  std::string compressed_log;
-  CompressLog(&compressed_log, log_buffer.get());
-
-  std::string local_log_id;
-
-  if (base::PathExists(upload_done_data.log_path)) {
-    webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
-
-    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
-    base::FilePath log_file_path =
-        upload_done_data.log_path.AppendASCII(local_log_id)
-            .AddExtension(FILE_PATH_LITERAL(".gz"));
-    WriteCompressedLogToFile(compressed_log, log_file_path);
-
-    base::FilePath log_list_path =
-        webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
-            upload_done_data.log_path);
-    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
-  }
-
-  WebRtcLogUploadDoneData upload_done_data_with_log_id = upload_done_data;
-  upload_done_data_with_log_id.local_log_id = local_log_id;
-  PrepareMultipartPostData(compressed_log, std::move(meta_data),
-                           upload_done_data_with_log_id);
-+  NotifyUploadDone(net::HTTP_OK, "", upload_done_data);
- }
- 
- void WebRtcLogUploader::PrepareMultipartPostData(
-@@ -149,6 +126,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
-   DCHECK(!compressed_log.empty());
-   DCHECK(meta_data.get());
- 
-+  NotifyUploadDone(net::HTTP_OK, "", upload_done_data);
-+  return;
-+
-   std::unique_ptr<std::string> post_data(new std::string());
-   SetupMultipart(post_data.get(),
-                  compressed_log,
-- 
-2.7.4
-
@@ -1,136 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:28:11 +0100
-Subject: ungoogled-chromium: Disable untraceable URLs
-
-Disable additional URLs that are not caught by the "trk" scheme
---
- chrome/browser/android/rlz/rlz_ping_handler.cc           | 2 +-
- chrome/browser/plugins/plugins_resource_service.cc       | 5 +----
- chrome/browser/safe_browsing/client_side_model_loader.cc | 6 ++----
- chrome/browser/safe_browsing/client_side_model_loader.h  | 1 -
- rlz/lib/financial_ping.cc                                | 4 ++--
- rlz/lib/lib_values.cc                                    | 1 -
- rlz/lib/lib_values.h                                     | 1 -
- 7 files changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
--- a/chrome/browser/android/rlz/rlz_ping_handler.cc
-+++ b/chrome/browser/android/rlz/rlz_ping_handler.cc
-@@ -66,7 +66,7 @@ void RlzPingHandler::Ping(
-   DCHECK_EQ(id.length(), 50u);
- 
-   GURL request_url(base::StringPrintf(
-      "https://%s%s?", rlz_lib::kFinancialServer, rlz_lib::kFinancialPingPath));
-+      "about:blank"));
-   request_url = net::AppendQueryParameter(
-       request_url, rlz_lib::kProductSignatureCgiVariable, "chrome");
-   request_url =
-diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
--- a/chrome/browser/plugins/plugins_resource_service.cc
-+++ b/chrome/browser/plugins/plugins_resource_service.cc
-@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
- // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
- const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
- 
-const char kPluginsServerUrl[] =
-    "https://www.gstatic.com/chrome/config/plugins_3/";
-
- GURL GetPluginsServerURL() {
-   std::string filename;
- #if defined(OS_WIN)
-@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
- #error Unknown platform
- #endif
- 
-  return GURL(kPluginsServerUrl + filename);
-+  return GURL("about:blank");
- }
- 
- }  // namespace
-diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
-+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -35,8 +35,6 @@ namespace safe_browsing {
- // Model Loader strings
- const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
- const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
-const char ModelLoader::kClientModelUrlPrefix[] =
-    "https://ssl.gstatic.com/safebrowsing/csd/";
- const char ModelLoader::kClientModelNamePattern[] =
-     "client_model_v5%s_variation_%d.pb";
- const char ModelLoader::kClientModelFinchExperiment[] =
-@@ -90,7 +88,7 @@ ModelLoader::ModelLoader(
-     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-     bool is_extended_reporting)
-     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
-      url_(kClientModelUrlPrefix + name_),
-+      url_("about:blank"),
-       update_renderers_callback_(update_renderers_callback),
-       url_loader_factory_(url_loader_factory),
-       weak_factory_(this) {
-@@ -103,7 +101,7 @@ ModelLoader::ModelLoader(
-     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-     const std::string& model_name)
-     : name_(model_name),
-      url_(kClientModelUrlPrefix + name_),
-+      url_("about:blank"),
-       update_renderers_callback_(update_renderers_callback),
-       url_loader_factory_(url_loader_factory),
-       weak_factory_(this) {
-diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
--- a/chrome/browser/safe_browsing/client_side_model_loader.h
-+++ b/chrome/browser/safe_browsing/client_side_model_loader.h
-@@ -42,7 +42,6 @@ class ModelLoader {
-   static const int kClientModelFetchIntervalMs;
-   static const char kClientModelFinchExperiment[];
-   static const char kClientModelFinchParam[];
-  static const char kClientModelUrlPrefix[];
-   static const char kClientModelNamePattern[];
- 
-   // Constructs a model loader to fetch a model using |url_loader_factory|.
-diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
--- a/rlz/lib/financial_ping.cc
-+++ b/rlz/lib/financial_ping.cc
-@@ -351,7 +351,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
- 
-   // Open network connection.
-   InternetHandle connection_handle = InternetConnectA(inet_handle,
-      kFinancialServer, kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
-+      "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
-       INTERNET_FLAG_NO_CACHE_WRITE, 0);
-   if (!connection_handle)
-     return PING_FAILURE;
-@@ -395,7 +395,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
-   return PING_SUCCESSFUL;
- #else
-   std::string url =
-      base::StringPrintf("https://%s%s", kFinancialServer, request);
-+      base::StringPrintf("about:blank");
- 
-   // Use a waitable event to cause this function to block, to match the
-   // wininet implementation.
-diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc
--- a/rlz/lib/lib_values.cc
-+++ b/rlz/lib/lib_values.cc
-@@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = "set_dcc";
- //
- 
- const char kFinancialPingPath[] = "/tools/pso/ping";
-const char kFinancialServer[]   = "clients1.google.com";
- const int kFinancialPort = 443;
- 
- // Ping times in 100-nanosecond intervals.
-diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
--- a/rlz/lib/lib_values.h
-+++ b/rlz/lib/lib_values.h
-@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariable[];
- //
- 
- extern const char kFinancialPingPath[];
-extern const char kFinancialServer[];
- 
- extern const int kFinancialPort;
- 
-- 
-2.7.4
-
@@ -1,53 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:28:53 +0100
-Subject: ungoogled-chromium: Disable translate integration
-
---
- components/translate/content/renderer/translate_helper.cc | 4 +++-
- components/translate/core/browser/translate_manager.cc    | 2 +-
- components/translate/core/browser/translate_script.cc     | 3 +--
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc
--- a/components/translate/content/renderer/translate_helper.cc
-+++ b/components/translate/content/renderer/translate_helper.cc
-@@ -74,7 +74,9 @@ TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
-       world_id_(world_id),
-       extension_scheme_(extension_scheme),
-       binding_(this),
-      weak_method_factory_(this) {}
-+      weak_method_factory_(this) {
-+  CancelPendingTranslation();
-+}
- 
- TranslateHelper::~TranslateHelper() {
- }
-diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
--- a/components/translate/core/browser/translate_manager.cc
-+++ b/components/translate/core/browser/translate_manager.cc
-@@ -102,7 +102,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) {
-   if (net::NetworkChangeNotifier::IsOffline())
-     return;
- 
-  if (!ignore_missing_key_for_testing_ && !::google_apis::HasKeysConfigured()) {
-+  if (true) {
-     // Without an API key, translate won't work, so don't offer to translate in
-     // the first place. Leave prefs::kOfferTranslateEnabled on, though, because
-     // that settings syncs and we don't want to turn off translate everywhere
-diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc
--- a/components/translate/core/browser/translate_script.cc
-+++ b/components/translate/core/browser/translate_script.cc
-@@ -149,9 +149,8 @@ void TranslateScript::OnScriptFetchComplete(
-     base::StringAppendF(&data_, "var serverParams = '%s';\n",
-                         server_params.c_str());
- 
-    GURL security_origin = translate::GetTranslateSecurityOrigin();
-     base::StringAppendF(
-        &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
-+        &data_, "var securityOrigin = '';");
- 
-     // Append embedded translate.js and a remote element library.
-     base::StringPiece str =
-- 
-2.7.4
-
@@ -1,35 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:29:30 +0100
-Subject: ungoogled-chromium: Disable profile avatar downloading
-
---
- chrome/browser/profiles/profile_avatar_downloader.cc | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
--- a/chrome/browser/profiles/profile_avatar_downloader.cc
-+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
-@@ -16,19 +16,13 @@
- #include "net/traffic_annotation/network_traffic_annotation.h"
- #include "ui/gfx/image/image.h"
- 
-namespace {
-const char kHighResAvatarDownloadUrlPrefix[] =
-    "https://www.gstatic.com/chrome/profile_avatars/";
-}
-
- ProfileAvatarDownloader::ProfileAvatarDownloader(
-     size_t icon_index,
-     const FetchCompleteCallback& callback)
-     : icon_index_(icon_index),
-       callback_(callback) {
-   DCHECK(!callback_.is_null());
-  GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
-           profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
-+  GURL url(std::string("about:blank"));
-   net::NetworkTrafficAnnotationTag traffic_annotation =
-       net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
-         semantics {
-- 
-2.7.4
-
@@ -1,28 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:30:30 +0100
-Subject: ungoogled-chromium: Disable intranet redirect detector
-
-Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled.
-
-See this page for more information: https://mikewest.org/2012/02/chrome-connects-to-three-random-domains-at-startup
---
- chrome/browser/intranet_redirect_detector.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
--- a/chrome/browser/intranet_redirect_detector.cc
-+++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSleep() {
-   simple_loaders_.clear();
-   resulting_origins_.clear();
- 
-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
-    return;
-+  return;
- 
-   DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
- 
-- 
-2.7.4
-
@@ -1,374 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:36:33 +0100
-Subject: ungoogled-chromium: Disable Google host detection
-
-Disables various detections of Google hosts and functionality specific to them
---
- .../page_load_metrics/page_load_metrics_util.cc    |   4 +-
- .../page_load_metrics/page_load_metrics_util.cc    |  33 +---
- components/google/core/browser/google_util.cc      | 193 ++-------------------
- components/search_engines/template_url.cc          |   6 +-
- net/base/url_util.cc                               |  22 ---
- 5 files changed, 14 insertions(+), 244 deletions(-)
-
-diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
--- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
-+++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
-@@ -169,9 +169,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
- }
- 
- bool IsGoogleSearchHostname(const GURL& url) {
-  base::Optional<std::string> result =
-      page_load_metrics::GetGoogleHostnamePrefix(url);
-  return result && result.value() == "www";
-+  return false;
- }
- 
- bool IsGoogleSearchResultUrl(const GURL& url) {
-diff --git a/chrome/common/page_load_metrics/page_load_metrics_util.cc b/chrome/common/page_load_metrics/page_load_metrics_util.cc
--- a/chrome/common/page_load_metrics/page_load_metrics_util.cc
-+++ b/chrome/common/page_load_metrics/page_load_metrics_util.cc
-@@ -12,38 +12,7 @@
- namespace page_load_metrics {
- 
- base::Optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
-  const size_t registry_length =
-      net::registry_controlled_domains::GetRegistryLength(
-          url,
-
-          // Do not include unknown registries (registries that don't have any
-          // matches in effective TLD names).
-          net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-
-          // Do not include private registries, such as appspot.com. We don't
-          // want to match URLs like www.google.appspot.com.
-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-
-  const base::StringPiece hostname = url.host_piece();
-  if (registry_length == 0 || registry_length == std::string::npos ||
-      registry_length >= hostname.length()) {
-    return base::Optional<std::string>();
-  }
-
-  // Removes the tld and the preceding dot.
-  const base::StringPiece hostname_minus_registry =
-      hostname.substr(0, hostname.length() - (registry_length + 1));
-
-  if (hostname_minus_registry == "google")
-    return std::string("");
-
-  if (!base::EndsWith(hostname_minus_registry, ".google",
-                      base::CompareCase::INSENSITIVE_ASCII)) {
-    return base::Optional<std::string>();
-  }
-
-  return std::string(hostname_minus_registry.substr(
-      0, hostname_minus_registry.length() - strlen(".google")));
-+  return base::Optional<std::string>();
- }
- 
- bool IsGoogleHostname(const GURL& url) {
-diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc
--- a/components/google/core/browser/google_util.cc
-+++ b/components/google/core/browser/google_util.cc
-@@ -41,118 +41,16 @@ namespace {
- 
- bool gUseMockLinkDoctorBaseURLForTesting = false;
- 
-bool IsPathHomePageBase(base::StringPiece path) {
-  return (path == "/") || (path == "/webhp");
-}
-
-// Removes a single trailing dot if present in |host|.
-void StripTrailingDot(base::StringPiece* host) {
-  if (host->ends_with("."))
-    host->remove_suffix(1);
-}
-
-// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
-// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
-// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
-// string in |tld|, if specified and the |host| can be parsed.
-bool IsValidHostName(base::StringPiece host,
-                     base::StringPiece domain_in_lower_case,
-                     SubdomainPermission subdomain_permission,
-                     base::StringPiece* tld) {
-  // Fast path to avoid searching the registry set.
-  if (host.find(domain_in_lower_case) == base::StringPiece::npos)
-    return false;
-
-  size_t tld_length =
-      net::registry_controlled_domains::GetCanonicalHostRegistryLength(
-          host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-  if ((tld_length == 0) || (tld_length == std::string::npos))
-    return false;
-
-  // Removes the tld and the preceding dot.
-  base::StringPiece host_minus_tld =
-      host.substr(0, host.length() - tld_length - 1);
-
-  if (tld)
-    *tld = host.substr(host.length() - tld_length);
-
-  if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case))
-    return true;
-
-  if (subdomain_permission == ALLOW_SUBDOMAIN) {
-    std::string dot_domain(".");
-    domain_in_lower_case.AppendToString(&dot_domain);
-    return base::EndsWith(host_minus_tld, dot_domain,
-                          base::CompareCase::INSENSITIVE_ASCII);
-  }
-
-  std::string www_domain("www.");
-  domain_in_lower_case.AppendToString(&www_domain);
-  return base::LowerCaseEqualsASCII(host_minus_tld, www_domain);
-}
-
-// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|
-// is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard
-// port for its scheme (80 for HTTP, 443 for HTTPS).
-bool IsValidURL(const GURL& url, PortPermission port_permission) {
-  return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&
-         (url.port().empty() || (port_permission == ALLOW_NON_STANDARD_PORTS));
-}
-
-bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
-                                   SubdomainPermission subdomain_permission) {
-  const GURL& base_url(CommandLineGoogleBaseURL());
-  if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
-    return true;
-
-  base::StringPiece tld;
-  if (!IsValidHostName(canonical_host, "google", subdomain_permission, &tld))
-    return false;
-
-  // Remove the trailing dot from tld if present, as for google domain it's the
-  // same page.
-  StripTrailingDot(&tld);
-
-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_tlds,
-                         ({GOOGLE_TLD_LIST}));
-  return base::ContainsKey(google_tlds, tld.as_string());
-}
-
-// True if |url| is a valid URL with a host that is in the static list of
-// Google subdomains for google search, and an HTTP or HTTPS scheme. Requires
-// |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS).
-bool IsGoogleSearchSubdomainUrl(const GURL& url) {
-  if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
-    return false;
-
-  base::StringPiece host(url.host_piece());
-  StripTrailingDot(&host);
-
-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_subdomains,
-                         ({"ipv4.google.com", "ipv6.google.com"}));
-
-  return base::ContainsKey(google_subdomains, host.as_string());
-}
-
- }  // namespace
- 
- // Global functions -----------------------------------------------------------
- 
- bool HasGoogleSearchQueryParam(base::StringPiece str) {
-  url::Component query(0, static_cast<int>(str.length())), key, value;
-  while (url::ExtractQueryKeyValue(str.data(), &query, &key, &value)) {
-    base::StringPiece key_str = str.substr(key.begin, key.len);
-    if (key_str == "q" || key_str == "as_q")
-      return true;
-  }
-   return false;
- }
- 
- GURL LinkDoctorBaseURL() {
-  if (gUseMockLinkDoctorBaseURLForTesting)
-    return GURL("http://mock.linkdoctor.url/for?testing");
-  return GURL(LINKDOCTOR_SERVER_REQUEST_URL);
-+  return GURL();
- }
- 
- void SetMockLinkDoctorBaseURLForTesting() {
-@@ -166,119 +64,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
- 
- GURL AppendGoogleLocaleParam(const GURL& url,
-                              const std::string& application_locale) {
-  return net::AppendQueryParameter(
-      url, "hl", GetGoogleLocale(application_locale));
-+  return url;
- }
- 
- std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
-  base::StringPiece google_hostname = google_homepage_url.host_piece();
-  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
-  // like "google.com./". https://crbug.com/720295.
-  const size_t last_dot = google_hostname.find_last_of('.');
-  DCHECK_NE(std::string::npos, last_dot);
-  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
-  // Assume the com TLD implies the US.
-  if (country_code == "com")
-    return "us";
-  // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
-  // code for the UK is "gb".
-  if (country_code == "uk")
-    return "gb";
-  // Catalonia does not have a CLDR country code, since it's a region in Spain,
-  // so use Spain instead.
-  if (country_code == "cat")
-    return "es";
-  return country_code.as_string();
-+  return "nolocale";
- }
- 
- GURL GetGoogleSearchURL(const GURL& google_homepage_url) {
-  // To transform the homepage URL into the corresponding search URL, add the
-  // "search" and the "q=" query string.
-  GURL::Replacements replacements;
-  replacements.SetPathStr("search");
-  replacements.SetQueryStr("q=");
-  return google_homepage_url.ReplaceComponents(replacements);
-+  return google_homepage_url;
- }
- 
- const GURL& CommandLineGoogleBaseURL() {
-  // Unit tests may add command-line flags after the first call to this
-  // function, so we don't simply initialize a static |base_url| directly and
-  // then unconditionally return it.
-  CR_DEFINE_STATIC_LOCAL(std::string, switch_value, ());
-   CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
-  std::string current_switch_value(
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kGoogleBaseURL));
-  if (current_switch_value != switch_value) {
-    switch_value = current_switch_value;
-    base_url = url_formatter::FixupURL(switch_value, std::string());
-    if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
-      base_url = GURL();
-  }
-+  base_url = GURL();
-   return base_url;
- }
- 
- bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
-  const GURL& base_url(CommandLineGoogleBaseURL());
-  return base_url.is_valid() &&
-         base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
-                          base::CompareCase::SENSITIVE);
-+  return false;
- }
- 
- bool IsGoogleHostname(base::StringPiece host,
-                       SubdomainPermission subdomain_permission) {
-  url::CanonHostInfo host_info;
-  return IsCanonicalHostGoogleHostname(net::CanonicalizeHost(host, &host_info),
-                                       subdomain_permission);
-+  return false;
- }
- 
- bool IsGoogleDomainUrl(const GURL& url,
-                        SubdomainPermission subdomain_permission,
-                        PortPermission port_permission) {
-  return IsValidURL(url, port_permission) &&
-         IsCanonicalHostGoogleHostname(url.host_piece(), subdomain_permission);
-+  return false;
- }
- 
- bool IsGoogleHomePageUrl(const GURL& url) {
-  // First check to see if this has a Google domain.
-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
-                         DISALLOW_NON_STANDARD_PORTS) &&
-      !IsGoogleSearchSubdomainUrl(url)) {
-    return false;
-  }
-
-  // Make sure the path is a known home page path.
-  base::StringPiece path(url.path_piece());
-  return IsPathHomePageBase(path) ||
-         base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
-+  return false;
- }
- 
- bool IsGoogleSearchUrl(const GURL& url) {
-  // First check to see if this has a Google domain.
-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
-                         DISALLOW_NON_STANDARD_PORTS) &&
-      !IsGoogleSearchSubdomainUrl(url)) {
-    return false;
-  }
-
-  // Make sure the path is a known search path.
-  base::StringPiece path(url.path_piece());
-  bool is_home_page_base = IsPathHomePageBase(path);
-  if (!is_home_page_base && (path != "/search"))
-    return false;
-
-  // Check for query parameter in URL parameter and hash fragment, depending on
-  // the path type.
-  return HasGoogleSearchQueryParam(url.ref_piece()) ||
-      (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
-+  return false;
- }
- 
- bool IsYoutubeDomainUrl(const GURL& url,
-                         SubdomainPermission subdomain_permission,
-                         PortPermission port_permission) {
-  return IsValidURL(url, port_permission) &&
-      IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
-                      nullptr);
-+  return false;
- }
- 
- const std::vector<std::string>& GetGoogleRegistrableDomains() {
-diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
--- a/components/search_engines/template_url.cc
-+++ b/components/search_engines/template_url.cc
-@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
- bool TemplateURLRef::HasGoogleBaseURLs(
-     const SearchTermsData& search_terms_data) const {
-   ParseIfNecessary(search_terms_data);
-  return std::any_of(replacements_.begin(), replacements_.end(),
-                     [](const Replacement& replacement) {
-                       return replacement.type == GOOGLE_BASE_URL ||
-                              replacement.type == GOOGLE_BASE_SUGGEST_URL;
-                     });
-+  return false;
- }
- 
- bool TemplateURLRef::ExtractSearchTermsFromURL(
-diff --git a/net/base/url_util.cc b/net/base/url_util.cc
--- a/net/base/url_util.cc
-+++ b/net/base/url_util.cc
-@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url,
- }
- 
- bool HasGoogleHost(const GURL& url) {
-  static const char* kGoogleHostSuffixes[] = {
-      ".google.com",
-      ".youtube.com",
-      ".gmail.com",
-      ".doubleclick.net",
-      ".gstatic.com",
-      ".googlevideo.com",
-      ".googleusercontent.com",
-      ".googlesyndication.com",
-      ".google-analytics.com",
-      ".googleadservices.com",
-      ".googleapis.com",
-      ".ytimg.com",
-  };
-  base::StringPiece host = url.host_piece();
-  for (const char* suffix : kGoogleHostSuffixes) {
-    // Here it's possible to get away with faster case-sensitive comparisons
-    // because the list above is all lowercase, and a GURL's host name will
-    // always be canonicalized to lowercase as well.
-    if (base::EndsWith(host, suffix, base::CompareCase::SENSITIVE))
-      return true;
-  }
-   return false;
- }
- 
-- 
-2.7.4
-
@@ -1,39 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:37:10 +0100
-Subject: ungoogled-chromium: Disable GCM
-
-Disable Google Cloud Messaging (GCM) client
---
- components/gcm_driver/gcm_client_impl.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
--- a/components/gcm_driver/gcm_client_impl.cc
-+++ b/components/gcm_driver/gcm_client_impl.cc
-@@ -502,6 +502,7 @@ void GCMClientImpl::StartGCM() {
- }
- 
- void GCMClientImpl::InitializeMCSClient() {
-+  return;
-   std::vector<GURL> endpoints;
-   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
-   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
-@@ -699,6 +700,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
- }
- 
- void GCMClientImpl::StartCheckin() {
-+  return;
-   // Make sure no checkin is in progress.
-   if (checkin_request_.get())
-     return;
-@@ -777,6 +779,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
- }
- 
- void GCMClientImpl::SchedulePeriodicCheckin() {
-+  return;
-   // Make sure no checkin is in progress.
-   if (checkin_request_.get() || !device_checkin_info_.accounts_set)
-     return;
-- 
-2.7.4
-
@@ -1,134 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:37:52 +0100
-Subject: ungoogled-chromium: Disable Gaia
-
-Disables Gaia code.
-Somehow it is still being activated even without being signed-in.
-
-See also: https://github.com/Eloston/ungoogled-chromium/issues/104
---
- chrome/browser/browser_resources.grd               |  2 --
- .../component_extensions_whitelist/whitelist.cc    |  1 -
- .../signin/gaia_auth_extension_loader.cc           |  7 ------
- .../resources/component_extension_resources.grd    |  2 --
- chrome/browser/ui/webui/signin/inline_login_ui.cc  |  1 -
- google_apis/gaia/gaia_auth_fetcher.cc              | 29 ----------------------
- 6 files changed, 42 deletions(-)
-
-diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
--- a/chrome/browser/browser_resources.grd
-+++ b/chrome/browser/browser_resources.grd
-@@ -301,7 +301,6 @@
-       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
-       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
-      <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" />
-       <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
-       <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-       <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
-@@ -436,7 +435,6 @@
-       </if>
-       <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
-       <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
-      <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" />
-       <if expr="chromeos">
-         <if expr="optimize_webui">
-           <then>
-diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
-+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
-@@ -68,7 +68,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
- #endif
-     case IDR_CRYPTOTOKEN_MANIFEST:
-     case IDR_FEEDBACK_MANIFEST:
-    case IDR_GAIA_AUTH_MANIFEST:
- #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
-     case IDR_HANGOUT_SERVICES_MANIFEST:
- #endif
-diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
-+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
-@@ -42,18 +42,11 @@ extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
- void LoadGaiaAuthExtension(BrowserContext* context) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
- 
-  extensions::ComponentLoader* component_loader = GetComponentLoader(context);
-   const base::CommandLine* command_line =
-       base::CommandLine::ForCurrentProcess();
-   if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
-    base::FilePath auth_extension_path =
-        command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
-    component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
-     return;
-   }
-
-  component_loader->Add(IDR_GAIA_AUTH_MANIFEST,
-                        base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
- }
- 
- void UnloadGaiaAuthExtension(BrowserContext* context) {
-diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
--- a/chrome/browser/resources/component_extension_resources.grd
-+++ b/chrome/browser/resources/component_extension_resources.grd
-@@ -40,8 +40,6 @@
-       <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
-       <!-- Material Design Bookmarks -->
-       <include name="IDR_COMPONENT_MD_BOOKMARKS_BOOKMARKS_HTML" file="md_bookmarks/bookmarks.html" type="BINDATA" />
-      <!-- Gaia auth extension -->
-      <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowexternalscript="true" type="BINDATA" />
-       <!-- Hangout Services extension, included in Google Chrome builds only. -->
-       <if expr="_google_chrome or enable_hangout_services_extension">
-         <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_services/background.html" type="BINDATA" />
-diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
-+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
-@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
- 
-   source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
-   source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
-  source->AddResourcePath("gaia_auth_host.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS);
- 
-   source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE);
-   source->AddLocalizedString(
-diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
--- a/google_apis/gaia/gaia_auth_fetcher.cc
-+++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
-     int load_flags,
-     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
-   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
-  fetcher_ = net::URLFetcher::Create(
-      0, gaia_gurl, body.empty() ? net::URLFetcher::GET : net::URLFetcher::POST,
-      this, traffic_annotation);
-  fetcher_->SetRequestContext(getter_);
-  fetcher_->SetUploadData("application/x-www-form-urlencoded", body);
-  gaia::MarkURLFetcherAsGaia(fetcher_.get());
-
-  VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec();
-  VLOG(2) << "Gaia fetcher headers: " << headers;
-  VLOG(2) << "Gaia fetcher body: " << body;
-
-  // The Gaia token exchange requests do not require any cookie-based
-  // identification as part of requests.  We suppress sending any cookies to
-  // maintain a separation between the user's browsing and Chrome's internal
-  // services.  Where such mixing is desired (MergeSession or OAuthLogin), it
-  // will be done explicitly.
-  fetcher_->SetLoadFlags(load_flags);
-
-  // Fetchers are sometimes cancelled because a network change was detected,
-  // especially at startup and after sign-in on ChromeOS. Retrying once should
-  // be enough in those cases; let the fetcher retry up to 3 times just in case.
-  // http://crbug.com/163710
-  fetcher_->SetAutomaticallyRetryOnNetworkChanges(3);
-
-  if (!headers.empty())
-    fetcher_->SetExtraRequestHeaders(headers);
-
-  fetch_pending_ = true;
-  fetcher_->Start();
- }
- 
- // static
-- 
-2.7.4
-
@@ -1,181 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Feb 2018 21:45:21 +0100
-Subject: ungoogled-chromium: Clear HTTP cache menu item
-
-Adds a menu item under "More tools" to clear the HTTP authentication cache on demand
---
- chrome/app/chrome_command_ids.h                      | 1 +
- chrome/app/generated_resources.grd                   | 6 ++++++
- chrome/browser/ui/browser_command_controller.cc      | 7 +++++++
- chrome/browser/ui/toolbar/app_menu_model.cc          | 8 ++++++++
- chrome/browser/ui/toolbar/app_menu_model.h           | 1 +
- chrome/browser/ui/views/frame/global_menu_bar_x11.cc | 1 +
- net/http/http_auth_cache.cc                          | 4 ++++
- net/http/http_auth_cache.h                           | 2 ++
- tools/metrics/histograms/enums.xml                   | 1 +
- tools/metrics/histograms/histograms.xml              | 1 +
- 10 files changed, 32 insertions(+)
-
-diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
--- a/chrome/app/chrome_command_ids.h
-+++ b/chrome/app/chrome_command_ids.h
-@@ -152,6 +152,7 @@
- #define IDC_DEV_TOOLS_INSPECT           40023
- #define IDC_UPGRADE_DIALOG              40024
- #define IDC_VIEW_INCOMPATIBILITIES      40025
-+#define IDC_CLEAR_HTTP_AUTH_CACHE       40026
- #define IDC_SHOW_KEYBOARD_OVERLAY       40027
- #define IDC_PROFILING_ENABLED           40028
- #define IDC_BOOKMARKS_MENU              40029
-diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
-+++ b/chrome/app/generated_resources.grd
-@@ -1053,6 +1053,9 @@ are declared in build/common.gypi.
-         <message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
-           &amp;Clear browsing data...
-         </message>
-+        <message name="IDS_CLEAR_HTTP_AUTH_CACHE" desc="The text label for the menu item for clearing the HTTP authentication cache">
-+          Clear &amp;HTTP auth cache
-+        </message>
-         <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
-           &amp;Downloads
-         </message>
-@@ -1091,6 +1094,9 @@ are declared in build/common.gypi.
-         <message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
-           &amp;Clear Browsing Data...
-         </message>
-+        <message name="IDS_CLEAR_HTTP_AUTH_CACHE" desc="In Title Case: The text label for the menu item for clearing the HTTP authentication cache">
-+          Clear &amp;HTTP Auth Cache
-+        </message>
-         <message name="IDS_SHOW_DOWNLOADS" desc="In Title Case: The show downloads menu in the app menu">
-           &amp;Downloads
-         </message>
-diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
--- a/chrome/browser/ui/browser_command_controller.cc
-+++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -60,6 +60,9 @@
- #include "extensions/browser/extension_system.h"
- #include "printing/buildflags/buildflags.h"
- #include "ui/events/keycodes/keyboard_codes.h"
-+#include "net/url_request/url_request_context.h"
-+#include "net/url_request/url_request_context_getter.h"
-+#include "net/http/http_transaction_factory.h"
- 
- #if defined(OS_MACOSX)
- #include "chrome/browser/ui/browser_commands_mac.h"
-@@ -629,6 +632,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
-     case IDC_CLEAR_BROWSING_DATA:
-       ShowClearBrowsingDataDialog(browser_);
-       break;
-+    case IDC_CLEAR_HTTP_AUTH_CACHE:
-+      profile()->GetRequestContext()->GetURLRequestContext()->http_transaction_factory()->GetSession()->http_auth_cache()->Clear();
-+      break;
-     case IDC_IMPORT_SETTINGS:
-       ShowImportDialog(browser_);
-       break;
-@@ -871,6 +877,7 @@ void BrowserCommandController::InitCommandState() {
-                                         !profile()->IsOffTheRecord());
-   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
-                                         !guest_session);
-+  command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true);
- #if defined(OS_CHROMEOS)
-   command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
- #else
-diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
-+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -215,6 +215,7 @@ void ToolsMenuModel::Build(Browser* browser) {
- 
-   AddSeparator(ui::NORMAL_SEPARATOR);
-   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
-+  AddItemWithStringId(IDC_CLEAR_HTTP_AUTH_CACHE, IDS_CLEAR_HTTP_AUTH_CACHE);
-   AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
-   if (chrome::CanOpenTaskManager())
-     AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-@@ -475,6 +476,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
-       }
-       LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
-       break;
-+    case IDC_CLEAR_HTTP_AUTH_CACHE:
-+      if (!uma_action_recorded_) {
-+        UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ClearHttpAuthCache",
-+                                   delta);
-+      }
-+      LogMenuAction(MENU_ACTION_CLEAR_HTTP_AUTH_CACHE);
-+      break;
-     case IDC_VIEW_SOURCE:
-       if (!uma_action_recorded_)
-         UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ViewSource", delta);
-diff --git a/chrome/browser/ui/toolbar/app_menu_model.h b/chrome/browser/ui/toolbar/app_menu_model.h
--- a/chrome/browser/ui/toolbar/app_menu_model.h
-+++ b/chrome/browser/ui/toolbar/app_menu_model.h
-@@ -76,6 +76,7 @@ enum AppMenuAction {
-   MENU_ACTION_OPEN_IN_CHROME = 48,
-   MENU_ACTION_SITE_SETTINGS = 49,
-   MENU_ACTION_APP_INFO = 50,
-+  MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 51,
-   LIMIT_MENU_ACTION
- };
- 
-diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
-+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
-@@ -225,6 +225,7 @@ GlobalMenuBarCommand tools_menu[] = {
- 
-     {IDS_TASK_MANAGER, IDC_TASK_MANAGER},
-     {IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA},
-+    {IDS_CLEAR_HTTP_AUTH_CACHE, IDC_CLEAR_HTTP_AUTH_CACHE},
- 
-     {MENU_SEPARATOR, MENU_SEPARATOR},
- 
-diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc
--- a/net/http/http_auth_cache.cc
-+++ b/net/http/http_auth_cache.cc
-@@ -250,6 +250,10 @@ bool HttpAuthCache::Remove(const GURL& origin,
-   return false;
- }
- 
-+void HttpAuthCache::Clear() {
-+  entries_.clear();
-+}
-+
- void HttpAuthCache::ClearEntriesAddedWithin(base::TimeDelta duration) {
-   base::TimeTicks begin_time = base::TimeTicks::Now() - duration;
-   base::EraseIf(entries_, [begin_time](const Entry& entry) {
-diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
--- a/net/http/http_auth_cache.h
-+++ b/net/http/http_auth_cache.h
-@@ -166,6 +166,8 @@ class NET_EXPORT HttpAuthCache {
-               HttpAuth::Scheme scheme,
-               const AuthCredentials& credentials);
- 
-+  void Clear();
-+
-   // Clears cache entries created within |duration| of base::TimeTicks::Now().
-   void ClearEntriesAddedWithin(base::TimeDelta duration);
- 
-diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
--- a/tools/metrics/histograms/enums.xml
-+++ b/tools/metrics/histograms/enums.xml
-@@ -48315,6 +48315,7 @@ Full version information for the fingerprint enum values:
-   <int value="48" label="Open in Chrome"/>
-   <int value="49" label="Site Settings"/>
-   <int value="50" label="App Info"/>
-+  <int value="51" label="Clear HTTP auth cache"/>
- </enum>
- 
- <enum name="XFrameOptions">
-diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
--- a/tools/metrics/histograms/histograms.xml
-+++ b/tools/metrics/histograms/histograms.xml
-@@ -107947,6 +107947,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
-   <suffix name="Overestimate"
-       label="Tracks when the compositor's estimates were too high and by how
-              much."/>
-+  <suffix name="ClearHttpAuthCache" label="Clear HTTP authentication cache"/>
-   <suffix name="Underestimate"
-       label="Tracks when the compositor's estimates were too low and by how
-              much."/>
-- 
-2.7.4
-
@@ -1,50 +0,0 @@
-From: Serg <serg.zhukovsky@gmail.com>
-Date: Tue, 31 Jan 2017 22:12:27 -0500
-Subject: Added exit menu item
-
---
- chrome/android/java/res/menu/main_menu.xml                             | 2 ++
- .../android/java/src/org/chromium/chrome/browser/ChromeActivity.java   | 2 ++
- chrome/android/java/strings/android_chrome_strings.grd                 | 3 +++
- 3 files changed, 7 insertions(+)
-
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- a/chrome/android/java/res/menu/main_menu.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -78,6 +78,8 @@
-             android:title="@string/menu_help" />
-         <item android:id="@+id/enter_vr_id"
-             android:title="@string/enter_vr" />
-+        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit" />
-     </group>
- 
-     <!-- Items shown only in the tab switcher -->
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -1951,6 +1951,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             RecordUserAction.record("MobileMenuSettings");
-         } else if (id == R.id.show_menu) {
-             showAppMenuForKeyboardEvent();
-+        } else if (id == R.id.exit_id) {
-+            ApplicationLifetime.terminate(false);
-         } else if (id == R.id.find_in_page_id) {
-             if (mFindToolbarManager == null) return false;
- 
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2563,6 +2563,9 @@ Google may use your browsing activity, content on some sites you visit, and othe
-       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
-         Settings
-       </message>
-+      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
-+        Exit
-+      </message>
-       <message name="IDS_MENU_CLOSE_ALL_TABS" desc="Menu item for closing all open tabs. [CHAR-LIMIT=27]">
-         Close all tabs
-       </message>
-- 
-2.7.4
-
@@ -1,79 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 18 Feb 2018 22:15:25 +0100
-Subject: Play videos in background
-
-Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
-Original Javascript code by timdream
---
- third_party/blink/renderer/core/dom/BUILD.gn            |  1 +
- third_party/blink/renderer/core/dom/document.cc         | 17 +++++++++++++----
- .../blink/renderer/core/dom/extensions/video_bg_play.h  |  6 ++++++
- 3 files changed, 20 insertions(+), 4 deletions(-)
- create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h
-
-diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
--- a/third_party/blink/renderer/core/dom/BUILD.gn
-+++ b/third_party/blink/renderer/core/dom/BUILD.gn
-@@ -148,6 +148,7 @@ blink_core_sources("dom") {
-     "events/window_event_context.cc",
-     "events/window_event_context.h",
-     "extensions/dont-track-me.h",
-+    "extensions/video-bg-play.h",
-     "exception_code.h",
-     "first_letter_pseudo_element.cc",
-     "first_letter_pseudo_element.h",
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -221,6 +221,7 @@
- #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
- #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
- #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
-+#include "extensions/video_bg_play.h"
- #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
- #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
- #include "third_party/blink/renderer/core/policy/document_policy.h"
-@@ -5848,17 +5849,25 @@ void Document::FinishedParsing() {
- 
-   // determine whether this is a Google search results page
-   const SecurityOrigin *origin = GetSecurityOrigin();
-  if (origin) {
-+  auto* bodyElement = body();
-+  if (origin && bodyElement) {
-     WTF::String domain = origin->Domain();
-     size_t pos = domain.Find(".google.");
-    auto* bodyElement = body();
-    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+    if ((pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-       LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
-       HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-       e->setText(ANTI_AMP_CURE_JS);
-       bodyElement->AppendChild(e);
-     }
-  }
-+
-+    // check for eligibility of the video bg fix
-+    if ((WTF::kNotFound != domain.Find("youtube.com")) || (WTF::kNotFound != domain.Find("vimeo.com"))) {
-+      LOG(INFO) << "injecting video-bg-play Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-+      e->setText(VIDEO_BG_PLAY_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  } // has origin and body element
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/blink/renderer/core/dom/extensions/video_bg_play.h b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
-new file mode 100644
--- /dev/null
-+++ b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
-@@ -0,0 +1,6 @@
-+#ifndef video_bg_play_h
-+#define video_bg_play_h
-+
-+#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
-+
-+#endif  // video_bg_play_h
-- 
-2.7.4
-
@@ -1,52 +0,0 @@
-From: AlexeyBarabash <alexey@brave.com>
-Date: Thu, 2 Nov 2017 18:21:16 +0200
-Subject: Allow playing audio in background
-
---
- media/blink/webmediaplayer_impl.cc | 11 ++++++++++-
- media/blink/webmediaplayer_impl.h  |  2 ++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
--- a/media/blink/webmediaplayer_impl.cc
-+++ b/media/blink/webmediaplayer_impl.cc
-@@ -853,6 +853,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
-   return pipeline_metadata_.has_audio;
- }
- 
-+bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
-+  DCHECK(main_task_runner_->BelongsToCurrentThread());
-+
-+  return pipeline_metadata_.has_video && pipeline_metadata_.natural_size.width() != 0 && pipeline_metadata_.natural_size.height() != 0;
-+}
-+
- void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
-   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -2877,7 +2883,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
-   // If suspending background video, pause any video that's not remoted or
-   // not unlocked to play in the background.
-   if (IsBackgroundedSuspendEnabled()) {
-    if (!HasVideo())
-+    //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
-+    //see media/base/pipeline_metadata.h. This is a workaround to allow audio
-+    //streams be played in background.
-+    if (!HasVideoNonEmptySize())
-       return false;
- 
- #if defined(OS_ANDROID)
-diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
--- a/media/blink/webmediaplayer_impl.h
-+++ b/media/blink/webmediaplayer_impl.h
-@@ -155,6 +155,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
-   // True if the loaded media has a playable video/audio track.
-   bool HasVideo() const override;
-   bool HasAudio() const override;
-+  // True is has video and it's frame size is not zero
-+  bool HasVideoNonEmptySize() const;
- 
-   void EnabledAudioTracksChanged(
-       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
-- 
-2.7.4
-
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 15:18:19 +0200
-Subject: Use Android MediaPlayer for URLs
-
---
- content/public/renderer/content_renderer_client.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
--- a/content/public/renderer/content_renderer_client.cc
-+++ b/content/public/renderer/content_renderer_client.cc
-@@ -121,7 +121,7 @@ bool ContentRendererClient::HandleNavigation(
- }
- 
- bool ContentRendererClient::ShouldUseMediaPlayerForURL(const GURL& url) {
-  return false;
-+  return true;
- }
- #endif
- 
-- 
-2.7.4
-
@@ -1,28 +0,0 @@
-From: AlexeyBarabash <alexey@brave.com>
-Date: Thu, 11 Jan 2018 13:27:34 +0200
-Subject: Open YouTube links in Bromite
-
---
- .../chrome/browser/externalnav/ExternalNavigationHandler.java      | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-@@ -357,6 +357,13 @@ public class ExternalNavigationHandler {
-             return OverrideUrlLoadingResult.NO_OVERRIDE;
-         }
- 
-+        // Force to open YouTube urls in Bromite
-+        String intentPackageName = intent.getPackage();
-+        if (intentPackageName != null && intentPackageName.equals("com.google.android.youtube")) {
-+            if (DEBUG) Log.i(TAG, "NO_OVERRIDE: YouTube URL for YouTube app");
-+            return OverrideUrlLoadingResult.NO_OVERRIDE;
-+        }
-+
-         // Sanitize the Intent, ensuring web pages can not bypass browser
-         // security (only access to BROWSABLE activities).
-         intent.addCategory(Intent.CATEGORY_BROWSABLE);
-- 
-2.7.4
-
@@ -1,189 +0,0 @@
-From: NoChromo <nochromo@nochromo.com>
-Date: Sun, 3 Apr 2016 12:44:50 +0800
-Subject: url_request: hooks and ad url data
-
---
- net/BUILD.gn                          |   2 +
- net/url_request/nochromo_intercept.cc | 116 ++++++++++++++++++++++++++++++++++
- net/url_request/nochromo_intercept.h  |  13 ++++
- net/url_request/url_request.cc        |   4 ++
- 4 files changed, 135 insertions(+)
- create mode 100644 net/url_request/nochromo_intercept.cc
- create mode 100644 net/url_request/nochromo_intercept.h
-
-diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1756,6 +1756,8 @@ component("net") {
-       "url_request/url_fetcher_response_writer.h",
-       "url_request/url_range_request_job.cc",
-       "url_request/url_range_request_job.h",
-+      "url_request/nochromo_intercept.cc",
-+      "url_request/nochromo_intercept.h",
-       "url_request/url_request.cc",
-       "url_request/url_request.h",
-       "url_request/url_request_context.cc",
-diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
-new file mode 100644
--- /dev/null
-+++ b/net/url_request/nochromo_intercept.cc
-@@ -0,0 +1,116 @@
-+#include "url/gurl.h"
-+#include "net/url_request/nochromo_entries.h"
-+
-+#include <android/log.h>
-+
-+namespace net {
-+  
-+#define NOCHROMO_LOG 0
-+#define NOCHROMO_LOG_MORE 0
-+
-+static char* strtolower(const char* str) {
-+  int len = strlen(str);
-+  char* ret = (char*)malloc(len + 1);
-+  ret[len] = '\0';
-+  for (int i = 0; i < len; i++) {
-+    if ((65 <= str[i]) && (str[i] <= 90)) {
-+      ret[i] = str[i] + 32;
-+    } else {
-+      ret[i] = str[i];
-+    }
-+  }
-+  return ret;
-+}
-+
-+static char* strtosep(const char* str) {
-+  int len = strlen(str);
-+  char* ret = (char*)malloc(len + 3);
-+  ret[0] = '^';
-+  ret[len + 1] = '^';
-+  ret[len + 2] = '\0';
-+  for (int i = 0; i < len; i++) {
-+    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
-+      ret[i + 1] = '^';
-+    } else {
-+      ret[i + 1] = str[i];
-+    }
-+  }
-+  return ret;
-+}
-+
-+int nochromo_intercept(const GURL& url) {
-+  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
-+    const char* c_url = url.spec().c_str();
-+    char* c_url_lower = strtolower(c_url);
-+    char* c_url_sep = strtosep(c_url);
-+    char* c_url_lower_sep = strtosep(c_url_lower);
-+    
-+    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
-+    
-+    bool intercept = false;
-+    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
-+      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
-+      
-+      // no use checking rules when we're intercepting, or exceptions when not
-+      bool check =
-+        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
-+        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
-+      
-+      if (check) {
-+        bool match = false;
-+        
-+        // select comparison string based on case and separator presence (separator takes some shortcuts)
-+        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
-+        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
-+        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
-+        
-+        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
-+        
-+        // check for all match parts at >= position of last match
-+        const char* last = match_url;
-+        for (int m = 0; m < entry->matchcount; m++) {
-+          const char* pos = strstr(last, entry->matches[m]);
-+          match = (pos != NULL);
-+          
-+          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
-+          
-+          // check if the url starts with the first match part
-+          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
-+          
-+          // check if the url ends with the last match part
-+          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
-+          
-+          // check domain match
-+          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
-+          
-+          // short circuit
-+          if (!match) break;
-+        }
-+        
-+        if (match) {
-+          if (NOCHROMO_LOG) {
-+            if (!intercept) {
-+              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
-+            } else {
-+              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
-+            }
-+          }
-+          intercept = !intercept;
-+        }
-+      }
-+    }
-+    
-+    free(c_url_sep);
-+    free(c_url_lower);
-+    free(c_url_lower_sep);
-+    
-+    if (intercept) {
-+      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
-+      return 1;
-+    }
-+    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
-+  }
-+  return 0;
-+}
-+
-+}  // namespace net
-\ No newline at end of file
-diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
-new file mode 100644
--- /dev/null
-+++ b/net/url_request/nochromo_intercept.h
-@@ -0,0 +1,13 @@
-+#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-+#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-+
-+#include "url/gurl.h"
-+
-+namespace net {
-+
-+GURL nochromo_intercepted = GURL("http://127.0.0.1/");
-+int nochromo_intercept(const GURL& url);
-+
-+}  // namespace net
-+
-+#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
--- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -44,6 +44,8 @@
- #include "url/gurl.h"
- #include "url/origin.h"
- 
-+#include "net/url_request/nochromo_intercept.h"
-+
- #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/network_error_logging/network_error_logging_service.h"
- #include "net/reporting/reporting_service.h"
-@@ -583,6 +585,8 @@ URLRequest::URLRequest(const GURL& url,
-   // Sanity check out environment.
-   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
- 
-+  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
-+
-   context->url_requests()->insert(this);
-   net_log_.BeginEvent(
-       NetLogEventType::REQUEST_ALIVE,
-- 
-2.7.4
-
@@ -1,584 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 28 Mar 2018 15:55:11 +0200
-Subject: Bromite adblock engine
-
-Ported from NoChromo patch
-Make interception testable
-Add domain support
-Re-land: third-party filters support
---
- net/BUILD.gn                          |   9 +-
- net/url_request/adblock_intercept.cc  | 324 ++++++++++++++++++++++++++++++++++
- net/url_request/adblock_intercept.h   |  16 ++
- net/url_request/nochromo_intercept.cc | 116 ------------
- net/url_request/nochromo_intercept.h  |  13 --
- net/url_request/url_request.cc        |  19 +-
- 6 files changed, 364 insertions(+), 133 deletions(-)
- create mode 100644 net/url_request/adblock_intercept.cc
- create mode 100644 net/url_request/adblock_intercept.h
- delete mode 100644 net/url_request/nochromo_intercept.cc
- delete mode 100644 net/url_request/nochromo_intercept.h
-
-diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1756,8 +1756,6 @@ component("net") {
-       "url_request/url_fetcher_response_writer.h",
-       "url_request/url_range_request_job.cc",
-       "url_request/url_range_request_job.h",
-      "url_request/nochromo_intercept.cc",
-      "url_request/nochromo_intercept.h",
-       "url_request/url_request.cc",
-       "url_request/url_request.h",
-       "url_request/url_request_context.cc",
-@@ -1815,6 +1813,13 @@ component("net") {
-       "//third_party/zlib",
-     ]
- 
-+    if (is_android) {
-+      sources += [
-+        "url_request/adblock_intercept.cc",
-+        "url_request/adblock_intercept.h"
-+      ]
-+    }
-+
-     if (enable_reporting) {
-       sources += [
-         "network_error_logging/network_error_logging_delegate.cc",
-diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
-new file mode 100644
--- /dev/null
-+++ b/net/url_request/adblock_intercept.cc
-@@ -0,0 +1,324 @@
-+#include "url/gurl.h"
-+
-+#ifdef ADB_TESTER
-+#include <cstddef>
-+#include <cstdlib>
-+#include <string.h>
-+
-+#include "log.h"
-+#include <tld.h>
-+
-+#else
-+
-+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-+#include <android/log.h>
-+
-+#endif
-+
-+#include "net/url_request/adblock_entries.h"
-+
-+namespace net {
-+
-+const char *LOG_TAG = "Bromite";
-+
-+#ifdef ADB_TESTER
-+int adblock_rules_count() { return ADBLOCK_ENTRY_COUNT; }
-+#endif
-+
-+// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
-+// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
-+// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
-+// string in |tld|, if specified and the |host| can be parsed.
-+static bool is_first_party(char *l_host, char *l_url_host) {
-+  size_t tld_length;
-+
-+#ifdef ADB_TESTER
-+  char *found_tld;
-+
-+  if (TLD_SUCCESS != tld_get_z(l_host, &found_tld))
-+    return false;
-+  tld_length = strlen(found_tld);
-+  if (tld_length == 0)
-+    return false;
-+#else
-+  tld_length = net::registry_controlled_domains::GetCanonicalHostRegistryLength(
-+      l_host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-+      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-+  if ((tld_length == 0) || (tld_length == std::string::npos))
-+    return false;
-+#endif
-+
-+  int len = strlen(l_host);
-+  char *tld = l_host + len - tld_length;
-+
-+  // Removes any subdomain from origin host.
-+  int i = len - tld_length - 2, top_i = i;
-+  if (i < 0) {
-+    return false;
-+  }
-+  char *domain = l_host;
-+  for (; i >= 0; i--) {
-+    if (l_host[i] == '.') {
-+      int p_len = top_i - i;
-+      // skip "co" in "co.uk", "org" in "org.uk"
-+      if (p_len <= 3) {
-+        tld -= p_len + 1;
-+        continue;
-+      }
-+
-+      // segment is long enough, accept it at as a domain
-+      domain = l_host + i;
-+      len -= i;
-+      break;
-+    }
-+  }
-+
-+#ifdef ADBLOCK_LOG
-+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
-+                      "%s: extracted domain suffix: \"%s\" (TLD=\"%s\")",
-+                      l_host, domain, tld);
-+#endif
-+
-+  // Check if supplied URL host matches, including the dot.
-+  int b_len = strlen(l_url_host);
-+  if (b_len < len) {
-+    return false;
-+  }
-+  for (int i = 0; i < len; i++) {
-+    if (l_url_host[b_len - 1 - i] != domain[len - 1 - i])
-+      return false;
-+  }
-+
-+  // pass with flying colors
-+  return true;
-+}
-+
-+static char *strtolower(const char *str) {
-+  int len = strlen(str);
-+  char *ret = (char *)malloc(len + 1);
-+  ret[len] = '\0';
-+  for (int i = 0; i < len; i++) {
-+    if ((65 <= str[i]) && (str[i] <= 90)) {
-+      ret[i] = str[i] + 32;
-+    } else {
-+      ret[i] = str[i];
-+    }
-+  }
-+  return ret;
-+}
-+
-+static char *strtosep(const char *str) {
-+  int len = strlen(str);
-+  char *ret = (char *)malloc(len + 3);
-+  ret[0] = '^';
-+  ret[len + 1] = '^';
-+  ret[len + 2] = '\0';
-+  for (int i = 0; i < len; i++) {
-+    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') ||
-+        (str[i] == '&') || (str[i] == '=')) {
-+      ret[i + 1] = '^';
-+    } else {
-+      ret[i + 1] = str[i];
-+    }
-+  }
-+  return ret;
-+}
-+
-+static bool url_matches(const char *c_url, char *c_url_sep, char *c_url_lower,
-+                        char *c_url_lower_sep, adblock_entry *entry) {
-+  bool match = false;
-+  // select comparison string based on case and separator presence (separator
-+  // takes some shortcuts)
-+  bool match_case = ((entry->flags & ADBLOCK_FLAG_MATCH_CASE) != 0);
-+  bool match_separator = ((entry->flags & ADBLOCK_FLAG_HAS_SEPARATOR) != 0);
-+  const char *match_url =
-+      match_case ? (match_separator ? c_url_sep : c_url)
-+                 : (match_separator ? c_url_lower_sep : c_url_lower);
-+
-+#ifdef ADBLOCK_LOG_MORE
-+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[case:%d][sep:%d][%s]",
-+                      match_case, match_separator, match_url);
-+#endif
-+  // check for all match parts at >= position of last match
-+  const char *last = match_url;
-+  for (int m = 0; const char *url_match = entry->matches[m]; m++) {
-+    bool is_last_match = entry->matches[m + 1] == NULL;
-+    const char *pos = strstr(last, url_match);
-+    match = (pos != NULL);
-+
-+#ifdef ADBLOCK_LOG_MORE
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s][found:%d][match:%d]",
-+                        entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
-+#endif
-+    // check if the url starts with the first match part
-+    if (match && (m == 0) && ((entry->flags & ADBLOCK_FLAG_MATCH_BEGIN) != 0) &&
-+        (pos != match_url))
-+      match = false;
-+
-+    // check if the url ends with the last match part
-+    if (match && is_last_match &&
-+        ((entry->flags & ADBLOCK_FLAG_MATCH_END) != 0) &&
-+        (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])]))
-+      match = false;
-+
-+    // check domain match
-+    if (match && (m == 0) &&
-+        ((entry->flags & ADBLOCK_FLAG_MATCH_DOMAIN) != 0) &&
-+        (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') &&
-+        (pos[-1] != '/'))
-+      match = false;
-+
-+    // short circuit
-+    if (!match)
-+      break;
-+  }
-+  return match;
-+}
-+
-+bool url_match_domain(adblock_entry *entry, const std::string &origin_host) {
-+  bool match_domain = true;
-+  // check for a negative domain match
-+  if (entry->domains_neg) {
-+    if (origin_host.empty()) {
-+      // skip this rule, cannot match on domain
-+      return false;
-+    }
-+    for (int d = 0; const char *domain = entry->domains_neg[d]; d++) {
-+      if (domain == origin_host) {
-+        match_domain = false;
-+        break;
-+      }
-+    }
-+  }
-+
-+  // check for a required positive domain match
-+  if (entry->domains) {
-+    if (origin_host.empty()) {
-+      // skip this rule, cannot match on domain
-+      return false;
-+    }
-+    for (int d = 0; const char *domain = entry->domains[d]; d++) {
-+      if (domain != origin_host) {
-+        match_domain = false;
-+        break;
-+      }
-+    }
-+  }
-+  return match_domain;
-+}
-+
-+static bool url_match_party(adblock_entry *entry, const GURL &url,
-+                            const std::string &origin_host, bool &checked_fp,
-+                            bool &fp) {
-+  bool wanted_fp;
-+  if ((entry->flags & ADBLOCK_FLAG_THIRD_PARTY) != 0) {
-+    wanted_fp = false;
-+  } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) {
-+    wanted_fp = true;
-+  } else {
-+    // no-op
-+    return true;
-+  }
-+
-+  if (origin_host.empty()) {
-+    // cannot match this rule, no origin host to determine first/third party
-+    return false;
-+  }
-+
-+#ifdef ADB_TESTER
-+//__android_log_print(ANDROID_LOG_INFO, LOG_TAG, "matchFirst=%d matchThird=%d",
-+// matchFirstParty, matchThirdParty);
-+#endif
-+  if (!checked_fp) {
-+    // lower-case version
-+    char *l_host = strtolower(origin_host.c_str()),
-+         *l_url_host = strtolower(url.host().c_str());
-+
-+    // is the URL a first-party to the current page's host?
-+    fp = is_first_party(l_host, l_url_host);
-+
-+    checked_fp = true;
-+#ifdef ADB_TESTER
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
-+                        "is_first_party(\"%s\", \"%s\") = %s", l_host,
-+                        l_url_host, fp ? "true" : "false");
-+#endif
-+    free(l_host);
-+    free(l_url_host);
-+  }
-+
-+  return fp == wanted_fp;
-+}
-+
-+int adblock_intercept(const GURL &url, const std::string &origin_host) {
-+  //  if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS()) {
-+  //     return 0;
-+  //  }
-+
-+  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
-+    const char *c_url = url.spec().c_str();
-+    char *c_url_lower = strtolower(c_url);
-+    char *c_url_sep = strtosep(c_url);
-+    char *c_url_lower_sep = strtosep(c_url_lower);
-+
-+#ifdef ADBLOCK_LOG
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s with host '%s'] [%s]",
-+                        c_url, url.host().c_str(), origin_host.c_str());
-+#endif
-+
-+    bool checked_fp = false, fp = false;
-+
-+    bool intercept = false;
-+    for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) {
-+      adblock_entry *entry = &ADBLOCK_ENTRIES[i];
-+
-+      // no use checking rules when we're intercepting, or exceptions when not
-+      bool check =
-+          (!intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) == 0)) ||
-+          (intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) != 0));
-+      if (!check)
-+        continue;
-+
-+      // first check for domain matches, a quick branch out if matching
-+      if (!url_match_domain(entry, origin_host))
-+        continue;
-+
-+      // check on the URL matcher
-+      if (!url_matches(c_url, c_url_sep, c_url_lower, c_url_lower_sep, entry))
-+        continue;
-+
-+      // finally check first/third-party
-+      if (!url_match_party(entry, url, origin_host, checked_fp, fp))
-+        continue;
-+
-+#ifdef ADBLOCK_LOG
-+      if (!intercept) {
-+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
-+                            "--> intercept (#%d: \"%s\") (%x)", i,
-+                            entry->matches[0], entry->flags);
-+      } else {
-+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "--> pass (%d) (#%d)", i,
-+                            entry->flags);
-+      }
-+#endif
-+      intercept = !intercept;
-+    } // for each entry
-+
-+    free(c_url_sep);
-+    free(c_url_lower);
-+    free(c_url_lower_sep);
-+
-+    if (intercept) {
-+#ifdef ADBLOCK_LOG
-+      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked");
-+#endif
-+      return 1;
-+    }
-+#ifdef ADBLOCK_LOG
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass");
-+#endif
-+  }
-+  return 0;
-+}
-+
-+} // namespace net
-diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
-new file mode 100644
--- /dev/null
-+++ b/net/url_request/adblock_intercept.h
-@@ -0,0 +1,16 @@
-+#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-+#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-+
-+#include "url/gurl.h"
-+
-+namespace net {
-+
-+#ifdef ADB_TESTER
-+int adblock_rules_count();
-+#endif
-+
-+int adblock_intercept(const GURL &url, const std::string &origin_host);
-+
-+} // namespace net
-+
-+#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
-deleted file mode 100644
--- a/net/url_request/nochromo_intercept.cc
-+++ /dev/null
-@@ -1,116 +0,0 @@
-#include "url/gurl.h"
-#include "net/url_request/nochromo_entries.h"
-
-#include <android/log.h>
-
-namespace net {
-  
-#define NOCHROMO_LOG 0
-#define NOCHROMO_LOG_MORE 0
-
-static char* strtolower(const char* str) {
-  int len = strlen(str);
-  char* ret = (char*)malloc(len + 1);
-  ret[len] = '\0';
-  for (int i = 0; i < len; i++) {
-    if ((65 <= str[i]) && (str[i] <= 90)) {
-      ret[i] = str[i] + 32;
-    } else {
-      ret[i] = str[i];
-    }
-  }
-  return ret;
-}
-
-static char* strtosep(const char* str) {
-  int len = strlen(str);
-  char* ret = (char*)malloc(len + 3);
-  ret[0] = '^';
-  ret[len + 1] = '^';
-  ret[len + 2] = '\0';
-  for (int i = 0; i < len; i++) {
-    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
-      ret[i + 1] = '^';
-    } else {
-      ret[i + 1] = str[i];
-    }
-  }
-  return ret;
-}
-
-int nochromo_intercept(const GURL& url) {
-  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
-    const char* c_url = url.spec().c_str();
-    char* c_url_lower = strtolower(c_url);
-    char* c_url_sep = strtosep(c_url);
-    char* c_url_lower_sep = strtosep(c_url_lower);
-    
-    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
-    
-    bool intercept = false;
-    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
-      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
-      
-      // no use checking rules when we're intercepting, or exceptions when not
-      bool check =
-        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
-        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
-      
-      if (check) {
-        bool match = false;
-        
-        // select comparison string based on case and separator presence (separator takes some shortcuts)
-        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
-        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
-        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
-        
-        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
-        
-        // check for all match parts at >= position of last match
-        const char* last = match_url;
-        for (int m = 0; m < entry->matchcount; m++) {
-          const char* pos = strstr(last, entry->matches[m]);
-          match = (pos != NULL);
-          
-          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
-          
-          // check if the url starts with the first match part
-          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
-          
-          // check if the url ends with the last match part
-          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
-          
-          // check domain match
-          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
-          
-          // short circuit
-          if (!match) break;
-        }
-        
-        if (match) {
-          if (NOCHROMO_LOG) {
-            if (!intercept) {
-              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
-            } else {
-              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
-            }
-          }
-          intercept = !intercept;
-        }
-      }
-    }
-    
-    free(c_url_sep);
-    free(c_url_lower);
-    free(c_url_lower_sep);
-    
-    if (intercept) {
-      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
-      return 1;
-    }
-    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
-  }
-  return 0;
-}
-
-}  // namespace net
-\ No newline at end of file
-diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
-deleted file mode 100644
--- a/net/url_request/nochromo_intercept.h
-+++ /dev/null
-@@ -1,13 +0,0 @@
-#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-
-#include "url/gurl.h"
-
-namespace net {
-
-GURL nochromo_intercepted = GURL("http://127.0.0.1/");
-int nochromo_intercept(const GURL& url);
-
-}  // namespace net
-
-#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
--- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -44,7 +44,9 @@
- #include "url/gurl.h"
- #include "url/origin.h"
- 
-#include "net/url_request/nochromo_intercept.h"
-+#if defined(OS_ANDROID)
-+#include "net/url_request/adblock_intercept.h"
-+#endif
- 
- #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/network_error_logging/network_error_logging_service.h"
-@@ -559,7 +561,9 @@ URLRequest::URLRequest(const GURL& url,
-                                          : context->network_delegate()),
-       net_log_(NetLogWithSource::Make(context->net_log(),
-                                       NetLogSourceType::URL_REQUEST)),
-+#if !defined(OS_ANDROID)
-       url_chain_(1, url),
-+#endif
-       attach_same_site_cookies_(false),
-       method_("GET"),
-       referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
-@@ -585,7 +589,18 @@ URLRequest::URLRequest(const GURL& url,
-   // Sanity check out environment.
-   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
- 
-  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
-+#if defined(OS_ANDROID)
-+  std::string initiatorHost;
-+  if (initiator_.has_value()) {
-+    initiatorHost = initiator_.value().host();
-+  }
-+
-+  if (adblock_intercept(url, initiatorHost)) {
-+     url_chain_ = { url, GURL("http://127.0.0.1") };
-+  } else {
-+     url_chain_ = { url };
-+  }
-+#endif
- 
-   context->url_requests()->insert(this);
-   net_log_.BeginEvent(
-- 
-2.7.4
-
@@ -1,54 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 21 Mar 2018 14:15:28 +0100
-Subject: User Agent: anonymize
-
-Remove device name and build id
---
- content/common/user_agent.cc | 25 ++-----------------------
- 1 file changed, 2 insertions(+), 23 deletions(-)
-
-diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
--- a/content/common/user_agent.cc
-+++ b/content/common/user_agent.cc
-@@ -79,26 +79,6 @@ std::string BuildOSCpuInfo() {
- 
- #if defined(OS_ANDROID)
-   std::string android_version_str = base::SysInfo::OperatingSystemVersion();
-
-  std::string android_info_str;
-
-  // Send information about the device.
-  bool semicolon_inserted = false;
-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
-  std::string android_device_name = base::SysInfo::HardwareModelName();
-  if ("REL" == android_build_codename && android_device_name.size() > 0) {
-    android_info_str += "; " + android_device_name;
-    semicolon_inserted = true;
-  }
-
-  // Append the build ID.
-  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
-  if (android_build_id.size() > 0) {
-    if (!semicolon_inserted) {
-      android_info_str += ";";
-    }
-    android_info_str += " Build/" + android_build_id;
-  }
- #endif
- 
-   base::StringAppendF(
-@@ -121,9 +101,8 @@ std::string BuildOSCpuInfo() {
-       os_minor_version,
-       os_bugfix_version
- #elif defined(OS_ANDROID)
-      "Android %s%s",
-      android_version_str.c_str(),
-      android_info_str.c_str()
-+      "Android %s",
-+      android_version_str.c_str()
- #else
-       "%s %s",
-       unixinfo.sysname,  // e.g. Linux
-- 
-2.7.4
-
@@ -1,77 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 22 Mar 2018 22:11:57 +0100
-Subject: Battery API: return nothing
-
---
- services/device/battery/battery_status_service.cc  |  2 +-
- .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
- 2 files changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
--- a/services/device/battery/battery_status_service.cc
-+++ b/services/device/battery/battery_status_service.cc
-@@ -41,7 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
-   if (!battery_fetcher_)
-     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
- 
-#if 0
-+#if !defined(OS_ANDROID)
-   if (callback_list_.empty()) {
-     bool success = battery_fetcher_->StartListeningBatteryChange();
-     // On failure pass the default values back.
-diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
-+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
- }
- 
- bool BatteryManager::charging() {
-  return battery_status_.Charging();
-+  return false;
- }
- 
- double BatteryManager::chargingTime() {
-  return battery_status_.charging_time();
-+  return 0;
- }
- 
- double BatteryManager::dischargingTime() {
-  return battery_status_.discharging_time();
-+  return 0;
- }
- 
- double BatteryManager::level() {
-  return battery_status_.Level();
-+  return 1;
- }
- 
- void BatteryManager::DidUpdateData() {
-   DCHECK(battery_property_);
- 
-  BatteryStatus old_status = battery_status_;
-  battery_status_ = *BatteryDispatcher::Instance().LatestData();
-
-   if (battery_property_->GetState() == ScriptPromisePropertyBase::kPending) {
-     battery_property_->Resolve(this);
-     return;
-   }
-
-  Document* document = ToDocument(GetExecutionContext());
-  DCHECK(document);
-  if (document->IsContextPaused() || document->IsContextDestroyed())
-    return;
-
-  if (battery_status_.Charging() != old_status.Charging())
-    DispatchEvent(Event::Create(EventTypeNames::chargingchange));
-  if (battery_status_.charging_time() != old_status.charging_time())
-    DispatchEvent(Event::Create(EventTypeNames::chargingtimechange));
-  if (battery_status_.discharging_time() != old_status.discharging_time())
-    DispatchEvent(Event::Create(EventTypeNames::dischargingtimechange));
-  if (battery_status_.Level() != old_status.Level())
-    DispatchEvent(Event::Create(EventTypeNames::levelchange));
- }
- 
- void BatteryManager::RegisterWithDispatcher() {
-- 
-2.7.4
-
@@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 22 Mar 2018 22:38:00 +0100
-Subject: Disable plugins enumeration
-
---
- third_party/blink/renderer/core/frame/local_frame.cc | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
-+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1175,10 +1175,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
- }
- 
- PluginData* LocalFrame::GetPluginData() const {
-  if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
-    return nullptr;
-  return GetPage()->GetPluginData(
-      Tree().Top().GetSecurityContext()->GetSecurityOrigin());
-+  // what about no
-+  return nullptr;
- }
- 
- DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
-- 
-2.7.4
-
@@ -1,57 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 25 Mar 2018 21:49:37 +0200
-Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL
-
-Return fixed base latency
---
- third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
- third_party/blink/renderer/modules/webaudio/audio_buffer.idl  | 4 ++--
- third_party/blink/renderer/modules/webaudio/audio_context.cc  | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
--- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
-+++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
-@@ -42,10 +42,10 @@ interface AnalyserNode : AudioNode {
- 
-     // Copies the current frequency data into the passed array.
-     // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
-    void getFloatFrequencyData(Float32Array array);
-    void getByteFrequencyData(Uint8Array array);
-+    //void getFloatFrequencyData(Float32Array array);
-+    //void getByteFrequencyData(Uint8Array array);
- 
-     // Real-time waveform data
-    void getFloatTimeDomainData(Float32Array array);
-    void getByteTimeDomainData(Uint8Array array);
-+    //void getFloatTimeDomainData(Float32Array array);
-+    //void getByteTimeDomainData(Uint8Array array);
- };
-diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
--- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-+++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-@@ -38,7 +38,7 @@
- 
-     // Channel access
-     readonly attribute unsigned long numberOfChannels;
-    [RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-    [RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
-+    //[RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-+    //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
-     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
- };
-diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
--- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
-+++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -261,7 +261,7 @@ void AudioContext::StopRendering() {
- }
- 
- double AudioContext::baseLatency() const {
-  return FramesPerBuffer() / static_cast<double>(sampleRate());
-+  return 0.04;
- }
- 
- }  // namespace blink
-- 
-2.7.4
-
@@ -1,130 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 30 Mar 2018 10:09:03 +0200
-Subject: Add fingerprinting mitigation for getClientRects,
- getBoundingClientRect
-
-Scale the result of Range::getClientRects and Element::getBoundingClientRect
-by a random +/-3% of the original value for each float in the Rect/Quad.
-The random value is generated once for each Document and re-used for all the
-attached elements.
-The rationale is that such value, albeit constant within the rendered Document,
-is within the same order of magniture of the floating point precision being
-used for fingerprinting and sufficient to poison the well.
-
-See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
---
- third_party/blink/renderer/core/dom/document.cc | 14 ++++++++++++++
- third_party/blink/renderer/core/dom/document.h  |  5 +++++
- third_party/blink/renderer/core/dom/element.cc  |  7 +++++++
- third_party/blink/renderer/core/dom/range.cc    |  8 +++++++-
- 4 files changed, 33 insertions(+), 1 deletion(-)
-
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -279,6 +279,8 @@
- 
- #include "extensions/anti_amp_cure.h"
- 
-+#include "base/rand_util.h"
-+
- #ifndef NDEBUG
- using WeakDocumentSet =
-     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
-@@ -740,6 +742,10 @@ Document::Document(const DocumentInit& initializer,
- #ifndef NDEBUG
-   liveDocumentSet().insert(this);
- #endif
-+
-+  // add +/- 3% noise against fingerprinting
-+  shuffleFactorX_ = 1 + (base::RandDouble() - 0.5) * 0.03;
-+  shuffleFactorY_ = 1 + (base::RandDouble() - 0.5) * 0.03;
- }
- 
- Document::~Document() {
-@@ -766,6 +772,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
-                        Position::BeforeNode(*shadow_host));
- }
- 
-+double Document::GetShuffleFactorX() {
-+	return shuffleFactorX_;
-+}
-+
-+double Document::GetShuffleFactorY() {
-+	return shuffleFactorY_;
-+}
-+
- SelectorQueryCache& Document::GetSelectorQueryCache() {
-   if (!selector_query_cache_)
-     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
--- a/third_party/blink/renderer/core/dom/document.h
-+++ b/third_party/blink/renderer/core/dom/document.h
-@@ -408,6 +408,9 @@ class CORE_EXPORT Document : public ContainerNode,
- 
-   String origin() const;
- 
-+  double GetShuffleFactorX();
-+  double GetShuffleFactorY();
-+
-   String visibilityState() const;
-   mojom::PageVisibilityState GetPageVisibilityState() const;
-   bool hidden() const;
-@@ -1670,6 +1673,8 @@ class CORE_EXPORT Document : public ContainerNode,
- 
-   double start_time_;
- 
-+  double shuffleFactorX_, shuffleFactorY_;
-+
-   TraceWrapperMember<ScriptRunner> script_runner_;
- 
-   HeapVector<Member<ScriptElementBase>> current_script_stack_;
-diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
--- a/third_party/blink/renderer/core/dom/element.cc
-+++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1348,6 +1348,11 @@ DOMRectList* Element::getClientRects() {
-   DCHECK(element_layout_object);
-   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
-       quads, *element_layout_object);
-+
-+  for (FloatQuad& quad : quads) {
-+    quad.Scale(GetDocument().GetShuffleFactorX(), GetDocument().GetShuffleFactorY());
-+  }
-+
-   return DOMRectList::Create(quads);
- }
- 
-@@ -1365,6 +1370,8 @@ DOMRect* Element::getBoundingClientRect() {
-   DCHECK(element_layout_object);
-   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
-                                                         *element_layout_object);
-+  result.Scale(GetDocument().GetShuffleFactorX(), GetDocument().GetShuffleFactorY());
-+
-   return DOMRect::FromFloatRect(result);
- }
- 
-diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
--- a/third_party/blink/renderer/core/dom/range.cc
-+++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1575,11 +1575,17 @@ DOMRectList* Range::getClientRects() const {
-   Vector<FloatQuad> quads;
-   GetBorderAndTextQuads(quads);
- 
-+  for (FloatQuad& quad : quads) {
-+    quad.Scale(owner_document_->GetShuffleFactorX(), owner_document_->GetShuffleFactorY());
-+  }
-+
-   return DOMRectList::Create(quads);
- }
- 
- DOMRect* Range::getBoundingClientRect() const {
-  return DOMRect::FromFloatRect(BoundingRect());
-+  auto rect = BoundingRect();
-+  rect.Scale(owner_document_->GetShuffleFactorX(), owner_document_->GetShuffleFactorY());
-+  return DOMRect::FromFloatRect(rect);
- }
- 
- // TODO(editing-dev): We should make
-- 
-2.7.4
-
@@ -1,318 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 24 Mar 2018 05:18:03 +0100
-Subject: Canvas: fingerprinting mitigations for image data, font metrics and
- webGL
-
-Disable webGL renderer info, add shuffling to TextMetrics.
-Additionally, the color data returned by ToBlob, ToDataURL and getImageData
-will contain randomly manipulated pixels (maximum 10) that slightly
-change the color of the R,G,B components without a visible effect.
-
-Credits to Slaviro (https://github.com/Slaviro) for coming up with a better
-approach to change color components.
---
- .../renderer/core/html/canvas/text_metrics.cc      |  20 +++
- .../blink/renderer/core/html/canvas/text_metrics.h |   2 +
- .../canvas/canvas2d/canvas_rendering_context_2d.cc |   6 +-
- .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
- .../platform/graphics/image_data_buffer.cc         |   4 +
- .../platform/graphics/static_bitmap_image.cc       | 151 +++++++++++++++++++++
- .../platform/graphics/static_bitmap_image.h        |   2 +
- 7 files changed, 186 insertions(+), 3 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-@@ -47,6 +47,26 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
-   return 0;
- }
- 
-+void TextMetrics::Shuffle(const double amt) {
-+  double adjusted = 1 + amt;
-+
-+  // x-direction
-+  width_ *= adjusted;
-+  actual_bounding_box_left_ *= adjusted;
-+  actual_bounding_box_right_ *= adjusted;
-+
-+  // y-direction
-+  font_bounding_box_ascent_ *= adjusted;
-+  font_bounding_box_descent_ *= adjusted;
-+  actual_bounding_box_ascent_ *= adjusted;
-+  actual_bounding_box_descent_ *= adjusted;
-+  em_height_ascent_ *= adjusted;
-+  em_height_descent_ *= adjusted;
-+  hanging_baseline_ *= adjusted;
-+  alphabetic_baseline_ *= adjusted;
-+  ideographic_baseline_ *= adjusted;
-+}
-+
- void TextMetrics::Update(const Font& font,
-                          const TextDirection& direction,
-                          const TextBaseline& baseline,
-diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
-+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
-@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
- 
-   static float GetFontBaseline(const TextBaseline&, const FontMetrics&);
- 
-+  void Shuffle(const double amt);
-+
-  private:
-   void Update(const Font&,
-               const TextDirection&,
-diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -773,8 +773,12 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
-   else
-     direction = ToTextDirection(GetState().GetDirection(), canvas());
- 
-  return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
-+  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
-                              GetState().GetTextAlign(), text);
-+
-+  textMetrics->Shuffle(canvas()->GetDocument().GetShuffleFactorX());
-+
-+  return textMetrics;
- }
- 
- void CanvasRenderingContext2D::DrawTextInternal(
-diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
--- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
- 
- WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
-     WebGLRenderingContextBase* context) {
-  return new WebGLDebugRendererInfo(context);
-+  return nullptr;
- }
- 
- bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
-  return true;
-+  return false;
- }
- 
- const char* WebGLDebugRendererInfo::ExtensionName() {
-diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-@@ -35,6 +35,7 @@
- #include <memory>
- 
- #include "base/memory/ptr_util.h"
-+#include "base/rand_util.h"
- #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
-@@ -121,6 +122,9 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type,
-                                   Vector<unsigned char>* encoded_image) const {
-   DCHECK(is_valid_);
- 
-+  // shuffle subchannel color data within the pixmap
-+  StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
-+
-   if (mime_type == "image/jpeg") {
-     SkJpegEncoder::Options options;
-     options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
-diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
-+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
-@@ -4,6 +4,7 @@
- 
- #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- 
-+#include "base/rand_util.h"
- #include "gpu/command_buffer/client/gles2_interface.h"
- #include "skia/ext/texture_handle.h"
- #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
-@@ -16,6 +17,7 @@
- #include "third_party/skia/include/core/SkCanvas.h"
- #include "third_party/skia/include/core/SkImage.h"
- #include "third_party/skia/include/core/SkPaint.h"
-+#include "third_party/skia/src/core/SkColorData.h"
- #include "third_party/skia/include/gpu/GrContext.h"
- 
- namespace blink {
-@@ -149,15 +151,164 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
-       rect.Width(), rect.Height(), color_type, kUnpremul_SkAlphaType,
-       color_params.GetSkColorSpaceForSkSurfaces());
-   sk_sp<SkImage> sk_image = src_image->PaintImageForCurrentFrame().GetSkImage();
-+
-   bool read_pixels_successful = sk_image->readPixels(
-       info, result.Data(), info.minRowBytes(), rect.X(), rect.Y());
-   DCHECK(read_pixels_successful ||
-          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
-              rect.X(), rect.Y(), info.width(), info.height())));
-+
-+  ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
-+
-   result.Transfer(dest_contents);
-   return true;
- }
- 
-+// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
-+#define shuffleComponent(color, max, delta) ( (color) >= (max) ? ((max)-(delta)) : ((color)+(delta)) )
-+
-+#define writable_addr(T, p, stride, x, y) (T*)((const char *)p + y * stride + x * sizeof(T))
-+
-+void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
-+  auto w = info.width() - srcX, h = info.height() - srcY;
-+
-+  // skip tiny images
-+  if (w + h <= 16) {
-+    return;
-+  }
-+
-+  // generate the first random number here
-+  double shuffleX = base::RandDouble();
-+
-+  // cap maximum pixels to change
-+  auto pixels = (w + h) / 128;
-+  if (pixels > 10) {
-+    pixels = 10;
-+  } else if (pixels < 2) {
-+    pixels = 2;
-+  }
-+
-+  auto colorType = info.colorType();
-+  auto fRowBytes = info.minRowBytes(); // stride
-+
-+  // second random number (for y/height)
-+  double shuffleY = base::RandDouble();
-+
-+  // calculate random coordinates using bisection
-+  auto currentW = w, currentH = h;
-+  for(;pixels >= 0; pixels--) {
-+    int x = currentW * shuffleX, y = currentH * shuffleY;
-+
-+    // calculate randomisation amounts for each RGB component
-+    auto shuffleR = (uint8_t)base::RandInt(0, 4), shuffleG = (uint8_t)base::RandInt(0, 4), shuffleB = (uint8_t)base::RandInt(0, 4);
-+
-+    // manipulate pixel data to slightly change the R, G, B components
-+    switch (colorType) {
-+      case kAlpha_8_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
-+         auto r = SkColorGetR(*pixel), g = SkColorGetG(*pixel), b = SkColorGetB(*pixel), a = SkColorGetA(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = SkColorSetARGB(a, r, g, b);
-+      }
-+      break;
-+      case kGray_8_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
-+         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
-+      }
-+      break;
-+      case kRGB_565_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
-+         unsigned    r = SkPacked16ToR32(*pixel);
-+         unsigned    g = SkPacked16ToG32(*pixel);
-+         unsigned    b = SkPacked16ToB32(*pixel);
-+
-+         r = shuffleComponent(r, 31, shuffleR);
-+         g = shuffleComponent(g, 63, shuffleG);
-+         b = shuffleComponent(b, 31, shuffleB);
-+
-+         unsigned r16 = (r & SK_R16_MASK) << SK_R16_SHIFT;
-+         unsigned g16 = (g & SK_G16_MASK) << SK_G16_SHIFT;
-+         unsigned b16 = (b & SK_B16_MASK) << SK_B16_SHIFT;
-+
-+         *pixel = r16 | g16 | b16;
-+      }
-+      break;
-+      case kARGB_4444_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA4444(*pixel), r = SkGetPackedR4444(*pixel), g = SkGetPackedG4444(*pixel), b = SkGetPackedB4444(*pixel);
-+
-+         r = shuffleComponent(r, 15, shuffleR);
-+         g = shuffleComponent(g, 15, shuffleG);
-+         b = shuffleComponent(b, 15, shuffleB);
-+         // alpha is left unchanged
-+
-+         unsigned a4 = (a & 0xF) << SK_A4444_SHIFT;
-+         unsigned r4 = (r & 0xF) << SK_R4444_SHIFT;
-+         unsigned g4 = (g & 0xF) << SK_G4444_SHIFT;
-+         unsigned b4 = (b & 0xF) << SK_B4444_SHIFT;
-+
-+         *pixel = r4 | b4 | g4 | a4;
-+      }
-+      break;
-+      case kRGBA_8888_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA32(*pixel), r = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), b = SkGetPackedB32(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
-+                  (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
-+      }
-+      break;
-+      case kBGRA_8888_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA32(*pixel), b = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), r = SkGetPackedB32(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = (a << SK_BGRA_A32_SHIFT) | (r << SK_BGRA_R32_SHIFT) |
-+                  (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
-+      }
-+      break;
-+      default:
-+         // the remaining formats are not expected to be used in Chromium
-+         return;
-+    }
-+
-+    // keep bisecting or reset current width/height as needed
-+    if (x == 0) {
-+       currentW = w;
-+    } else {
-+       currentW = x;
-+    }
-+    if (y == 0) {
-+       currentH = h;
-+    } else {
-+       currentH = y;
-+    }
-+  }
-+}
-+
-+#undef writable_addr
-+#undef shuffleComponent
-+
- const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
-   static const gpu::SyncToken sync_token;
-   return sync_token;
-diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-@@ -46,6 +46,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
-   static scoped_refptr<StaticBitmapImage> Create(WTF::ArrayBufferContents&,
-                                                  const SkImageInfo&);
- 
-+  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
-+
-   bool IsStaticBitmapImage() const override { return true; }
- 
-   // Methods overridden by all sub-classes
-- 
-2.7.4
-
@@ -1,24 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 2 Apr 2018 11:36:02 +0200
-Subject: Punt the Widevine version string
-
-Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch
---
- chrome/common/chrome_content_client.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
--- a/chrome/common/chrome_content_client.cc
-+++ b/chrome/common/chrome_content_client.cc
-@@ -526,7 +526,7 @@ void ChromeContentClient::AddContentDecryptionModules(
-     bool supports_persistent_license = false;
-     if (IsWidevineAvailable(&cdm_path, &video_codecs_supported,
-                             &supports_persistent_license)) {
-      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
-+      const base::Version version("1.0.123.456");
-       DCHECK(version.IsValid());
- 
-       cdms->push_back(content::CdmInfo(
-- 
-2.7.4
-
@@ -1,183 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 18 Oct 2017 21:26:53 +0200
-Subject: Add menu option to toggle global Javascript preference
-
---
- chrome/android/java/res/menu/custom_tabs_menu.xml  | 13 ++++++++
- chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
- .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
- .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 37 ++++++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
- .../java/strings/android_chrome_strings.grd        | 11 +++++++
- 7 files changed, 91 insertions(+)
-
-diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
-+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -49,6 +49,19 @@
-         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_open_webapk"
-             android:orderInCategory="2" />
-+
-+        <item android:id="@+id/enable_javascript_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
-+          <menu>
-+              <item android:id="@+id/enable_javascript_id"
-+                  android:title="@string/menu_enable_javascript" />
-+              <item android:id="@+id/enable_javascript_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null"
-             android:orderInCategory="2">
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- a/chrome/android/java/res/menu/main_menu.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -59,6 +59,19 @@
-             android:title="@string/menu_add_to_homescreen" />
-         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_open_webapk" />
-+
-+        <item android:id="@+id/enable_javascript_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
-+          <menu>
-+              <item android:id="@+id/enable_javascript_id"
-+                  android:title="@string/menu_enable_javascript" />
-+              <item android:id="@+id/enable_javascript_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null">
-           <menu>
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2054,6 +2054,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
-             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
-             RecordUserAction.record("MobileMenuRequestDesktopSite");
-+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
-+            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
-+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
-+            if (reloadOnChange) {
-+				currentTab.reload();
-+			}
-+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
-         } else if (id == R.id.reader_mode_prefs_id) {
-             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
-         } else {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1710,6 +1710,14 @@ public class ChromeTabbedActivity
-                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
-             }
-             RecordUserAction.record("MobileMenuDownloadManager");
-+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
-+            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
-+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
-+            if (reloadOnChange) {
-+				currentTab.reload();
-+			}
-+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
-         } else if (id == R.id.open_recently_closed_tab) {
-             TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
-             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -214,6 +214,8 @@ public class AppMenuPropertiesDelegate {
- 
-             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
- 
-+            updateEnableJavascriptMenuItem(menu, currentTab);
-+
-             // Only display reader mode settings menu option if the current page is in reader mode.
-             menu.findItem(R.id.reader_mode_prefs_id)
-                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
-@@ -469,4 +471,39 @@ public class AppMenuPropertiesDelegate {
- 
-         return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems;
-     }
-+
-+    /**
-+     * Updates the enable JavaScript item's state.
-+     *
-+     * @param menu {@link Menu} for enable javascript
-+     * @param currentTab      Current tab being displayed.
-+     */
-+    protected void updateEnableJavascriptMenuItem(
-+            Menu menu, Tab currentTab) {
-+        MenuItem enableMenuRow = menu.findItem(R.id.enable_javascript_row_menu_id);
-+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_javascript_id);
-+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_javascript_check_id);
-+
-+        // Hide enable javascript on all chrome:// pages except for the NTP.
-+        String url = currentTab.getUrl();
-+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
-+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
-+        // Also hide enable javascsript on Reader Mode.
-+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
-+
-+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
-+        enableMenuRow.setVisible(itemVisible);
-+        if (!itemVisible) return;
-+
-+        boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
-+
-+        // Mark the checkbox if Javascript is activated on this tab.
-+        enableMenuCheck.setChecked(jsEnabled);
-+
-+        // This title doesn't seem to be displayed by Android, but it is used to set up
-+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
-+        enableMenuLabel.setTitleCondensed(jsEnabled
-+                        ? mActivity.getString(R.string.menu_enable_javascript_on)
-+                        : mActivity.getString(R.string.menu_enable_javascript_off));
-+    }
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-             }
- 
-             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
-+            updateEnableJavascriptMenuItem(menu, currentTab);
-             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
-         }
-     }
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2548,6 +2548,17 @@ Google may use your browsing activity, content on some sites you visit, and othe
-       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
-         Find in page
-       </message>
-+
-+      <message name="IDS_MENU_ENABLE_JAVASCRIPT" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable JavaScript support for the page. [CHAR-LIMIT=27]">
-+        Enable JavaScript
-+      </message>
-+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_ON" desc="Accessibility description for when Enable JavaScript is selected.">
-+        Turn off JavaScript
-+      </message>
-+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_OFF" desc="Accessibility description for when Enable JavaScript is unselected.">
-+        Turn on JavaScript
-+      </message>
-+
-       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Chrome's overflow/options menu. By default, when a user navigates to a web page, Chrome shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Chrome will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
-         Desktop site
-       </message>
-- 
-2.7.4
-
@@ -1,259 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 26 Apr 2018 10:37:05 +0200
-Subject: Add menu option to toggle global Adblock preference
-
-Allow toggling Chromium's "ads enabled" content settings option together with Bromite adblock engine.
---
- chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
- chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
- .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
- .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 ++++++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java        |  2 ++
- .../java/strings/android_chrome_strings.grd        | 11 +++++++
- .../subresource_filter_content_settings_manager.cc |  3 ++
- net/url_request/adblock_intercept.cc               |  2 ++
- net/url_request/adblock_intercept.h                |  2 ++
- net/url_request/url_request.cc                     |  4 +++
- 11 files changed, 103 insertions(+)
-
-diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
-+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -74,6 +74,18 @@
-           </menu>
-         </item>
- 
-+        <item android:id="@+id/enable_adblock_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
-+          <menu>
-+              <item android:id="@+id/enable_adblock_id"
-+                  android:title="@string/menu_enable_adblock" />
-+              <item android:id="@+id/enable_adblock_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <!-- Title is intentionally left blank in xml and will be set in java. -->
-         <item android:id="@+id/open_in_browser_id"
-             android:title=""
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- a/chrome/android/java/res/menu/main_menu.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -82,6 +82,19 @@
-                 android:checkable="true" />
-           </menu>
-         </item>
-+
-+        <item android:id="@+id/enable_adblock_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
-+          <menu>
-+              <item android:id="@+id/enable_adblock_id"
-+                  android:title="@string/menu_enable_adblock" />
-+              <item android:id="@+id/enable_adblock_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <item android:id="@+id/reader_mode_prefs_id"
-             android:title="@string/menu_reader_mode_prefs"
-             android:icon="@drawable/reader_mode_prefs_icon" />
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2064,6 +2064,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             RecordUserAction.record("MobileMenuRequestEnableJavascript");
-         } else if (id == R.id.reader_mode_prefs_id) {
-             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
-+        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
-+            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
-+            PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled);
-+            if (reloadOnChange) {
-+                currentTab.reload();
-+            }
-+            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
-         } else {
-             return false;
-         }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1724,6 +1724,14 @@ public class ChromeTabbedActivity
-             RecordUserAction.record("MobileTabClosedUndoShortCut");
-         } else if (id == R.id.enter_vr_id) {
-             VrShellDelegate.enterVrIfNecessary();
-+        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
-+            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
-+            PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled);
-+            if (reloadOnChange) {
-+               currentTab.reload();
-+            }
-+            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
-         } else {
-             return super.onMenuOrKeyboardAction(id, fromMenu);
-         }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -212,6 +212,8 @@ public class AppMenuPropertiesDelegate {
-                     && !TextUtils.isEmpty(url);
-             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
- 
-+            updateEnableAdBlockMenuItem(menu, currentTab);
-+
-             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
- 
-             updateEnableJavascriptMenuItem(menu, currentTab);
-@@ -445,6 +447,42 @@ public class AppMenuPropertiesDelegate {
-     }
- 
-     /**
-+     * Updates the enable AdBlock item's state.
-+     *
-+     * @param menu {@link Menu} for enable adblock
-+     * @param currentTab      Current tab being displayed.
-+     */
-+    protected void updateEnableAdBlockMenuItem(
-+            Menu menu, Tab currentTab) {
-+        MenuItem enableMenuRow = menu.findItem(R.id.enable_adblock_row_menu_id);
-+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_adblock_id);
-+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
-+
-+
-+        // Hide enable adblock on all chrome:// pages except for the NTP.
-+        String url = currentTab.getUrl();
-+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
-+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
-+        // Also hide enable javascsript on Reader Mode.
-+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
-+
-+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
-+        enableMenuRow.setVisible(itemVisible);
-+        if (!itemVisible) return;
-+
-+        boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
-+
-+        // Mark the checkbox if adblock is globally activate.
-+        enableMenuCheck.setChecked(adBlockEnabled);
-+
-+        // This title doesn't seem to be displayed by Android, but it is used to set up
-+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
-+        enableMenuLabel.setTitleCondensed(adBlockEnabled
-+                        ? mActivity.getString(R.string.menu_enable_adblock_on)
-+                        : mActivity.getString(R.string.menu_enable_adblock_off));
-+    }
-+
-+    /**
-      * @return Whether bookmarks, downloads, and history should be shown in the menu.
-      */
-     public static boolean shouldShowNavMenuItems() {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -170,6 +170,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-                 }
-             }
- 
-+            updateEnableAdBlockMenuItem(menu, currentTab);
-+
-             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
-             updateEnableJavascriptMenuItem(menu, currentTab);
-             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2568,6 +2568,17 @@ Google may use your browsing activity, content on some sites you visit, and othe
-       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
-         Turn on Request desktop site
-       </message>
-+
-+      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable AdBlock engine for the page. [CHAR-LIMIT=27]">
-+        Enable AdBlock
-+      </message>
-+      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
-+        Turn off AdBlock
-+      </message>
-+      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
-+        Turn on AdBlock
-+      </message>
-+
-       <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">
-         Appearance
-       </message>
-diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
--- a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
-+++ b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
-@@ -22,6 +22,7 @@
- #include "components/keyed_service/core/service_access_type.h"
- #include "components/subresource_filter/core/browser/subresource_filter_features.h"
- #include "url/gurl.h"
-+#include "net/url_request/adblock_intercept.h"
- 
- namespace {
- 
-@@ -160,9 +161,11 @@ void SubresourceFilterContentSettingsManager::OnContentSettingChanged(
-     if (global_setting == CONTENT_SETTING_ALLOW) {
-       ChromeSubresourceFilterClient::LogAction(
-           kActionContentSettingsAllowedGlobal);
-+      net::adblock_enabled = false;
-     } else if (global_setting == CONTENT_SETTING_BLOCK) {
-       ChromeSubresourceFilterClient::LogAction(
-           kActionContentSettingsBlockedGlobal);
-+      net::adblock_enabled = true;
-     } else {
-       NOTREACHED();
-     }
-diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
--- a/net/url_request/adblock_intercept.cc
-+++ b/net/url_request/adblock_intercept.cc
-@@ -19,6 +19,8 @@
- 
- namespace net {
- 
-+bool adblock_enabled = true;
-+
- const char *LOG_TAG = "Bromite";
- 
- #ifdef ADB_TESTER
-diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
--- a/net/url_request/adblock_intercept.h
-+++ b/net/url_request/adblock_intercept.h
-@@ -11,6 +11,8 @@ int adblock_rules_count();
- 
- int adblock_intercept(const GURL &url, const std::string &origin_host);
- 
-+extern bool adblock_enabled;
-+
- } // namespace net
- 
- #endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
--- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -590,6 +590,7 @@ URLRequest::URLRequest(const GURL& url,
-   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
- 
- #if defined(OS_ANDROID)
-+  if (net::adblock_enabled) {
-   std::string initiatorHost;
-   if (initiator_.has_value()) {
-     initiatorHost = initiator_.value().host();
-@@ -600,6 +601,9 @@ URLRequest::URLRequest(const GURL& url,
-   } else {
-      url_chain_ = { url };
-   }
-+  } else {
-+     url_chain_ = { url };
-+  }
- #endif
- 
-   context->url_requests()->insert(this);
-- 
-2.7.4
-
@@ -1,45 +0,0 @@
-From: SergeyZhukovsky <serg.zhukovsky@gmail.com>
-Date: Tue, 15 Aug 2017 15:33:16 -0400
-Subject: Remove google account access permission on reboot
-
---
- chrome/android/BUILD.gn                 | 3 +--
- chrome/android/java/AndroidManifest.xml | 4 ++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
-+++ b/chrome/android/BUILD.gn
-@@ -784,8 +784,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
-   resources = [
-     "java/res_template/xml/file_paths.xml",
-     "java/res_template/xml/launchershortcuts.xml",
-    "java/res_template/xml/searchable.xml",
-    "java/res_template/xml/syncadapter.xml",
-+    "java/res_template/xml/searchable.xml"
-   ]
-   res_dir = "java/res_template"
-   variables = chrome_public_jinja_variables
-diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
-+++ b/chrome/android/java/AndroidManifest.xml
-@@ -804,14 +804,14 @@ by a child template that "extends" this file.
-         </provider>
- 
-         <!-- Sync adapter for browser invalidation. -->
-        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
-+        <!--<service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
-             android:exported="false">
-             <intent-filter>
-                 <action android:name="android.content.SyncAdapter" />
-             </intent-filter>
-             <meta-data android:name="android.content.SyncAdapter"
-                        android:resource="@xml/syncadapter" />
-        </service>
-+        </service>-->
- 
-         <!-- Broadcast receiver that will be notified of account changes -->
-         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
-- 
-2.7.4
-
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 25 Apr 2018 10:23:51 +0200
-Subject: Disable metrics on all I/O threads
-
---
- chrome/browser/profiles/profile_io_data.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
--- a/chrome/browser/profiles/profile_io_data.cc
-+++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -964,7 +964,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
- 
- bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  return enable_metrics_.GetValue();
-+  return false;
- }
- 
- chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
-- 
-2.7.4
-
@@ -1,282 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 28 Apr 2018 08:30:26 +0200
-Subject: Add a flag for DNS-over-HTTPS
-
-Allow selection between Google and Cloudflare endpoints.
-Serve DoH requests with maximum priority, remove traffic annotation.
-Reduce HTTP headers in DoH requests to bare minimum.
-
-See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt
---
- chrome/browser/about_flags.cc                      | 12 +++++++++
- chrome/browser/flag_descriptions.cc                |  3 +++
- chrome/browser/flag_descriptions.h                 |  3 +++
- chrome/browser/io_thread.cc                        | 14 +++++++----
- .../common/network_features.cc                     |  5 ++--
- .../common/network_features.h                      |  5 ++--
- .../common/network_switch_list.h                   |  4 +++
- net/base/load_flags_list.h                         |  6 +++++
- net/dns/dns_transaction.cc                         | 29 +++-------------------
- net/url_request/url_request_http_job.cc            | 28 +++++++++++++--------
- 10 files changed, 64 insertions(+), 45 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -395,6 +395,12 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = {
-      switches::kChromeHomeSwipeLogicType, "velocity"},
- };
- 
-+const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
-+    {features::kDnsOverHttpsChoiceDefault, "", ""},
-+    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
-+    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
-+};
-+
- #endif  // OS_ANDROID
- 
- const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
-@@ -3544,6 +3550,12 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kAsyncDns)},
- #endif  // defined(OS_ANDROID)
- 
-+#if defined(OS_ANDROID)
-+    {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName,
-+     flag_descriptions::kDnsOverHttpsDescription, kOsAndroid,
-+     MULTI_VALUE_TYPE(kDnsOverHttpsChoices)},
-+#endif  // defined(OS_ANDROID)
-+
-     {"enable-overflow-icons-for-media-controls",
-      flag_descriptions::kOverflowIconsForMediaControlsName,
-      flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll,
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -1849,6 +1849,9 @@ const char kAndroidPaymentAppsDescription[] =
- const char kAsyncDnsName[] = "Async DNS resolver";
- const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
- 
-+const char kDnsOverHttpsName[] = "DNS over HTTPS";
-+const char kDnsOverHttpsDescription[] = "Enables DNS-over-HTTPS (experimental).";
-+
- const char kAutofillAccessoryViewName[] =
-     "Autofill suggestions as keyboard accessory view";
- const char kAutofillAccessoryViewDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1133,6 +1133,9 @@ extern const char kAndroidPaymentAppsDescription[];
- extern const char kAsyncDnsName[];
- extern const char kAsyncDnsDescription[];
- 
-+extern const char kDnsOverHttpsName[];
-+extern const char kDnsOverHttpsDescription[];
-+
- extern const char kAutofillAccessoryViewName[];
- extern const char kAutofillAccessoryViewDescription[];
- 
-diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
--- a/chrome/browser/io_thread.cc
-+++ b/chrome/browser/io_thread.cc
-@@ -53,6 +53,7 @@
- #include "components/metrics/metrics_service.h"
- #include "components/net_log/chrome_net_log.h"
- #include "components/network_session_configurator/common/network_features.h"
-+#include "components/network_session_configurator/common/network_switches.h"
- #include "components/policy/core/common/policy_service.h"
- #include "components/policy/policy_constants.h"
- #include "components/prefs/pref_registry_simple.h"
-@@ -383,13 +384,16 @@ IOThread::IOThread(
-                                       base::Unretained(this)));
-   dns_client_enabled_.MoveToThread(io_thread_proxy);
- 
-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
-+  std::string dnsOverHttpsServer =
-+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-+      switches::kDnsOverHttpsServer);
-+  if (!dnsOverHttpsServer.empty()) {
-     base::Value specs(base::Value::Type::LIST);
-     base::Value methods(base::Value::Type::LIST);
-    base::Value spec(variations::GetVariationParamValueByFeature(
-        features::kDnsOverHttps, "server"));
-    base::Value method(variations::GetVariationParamValueByFeature(
-        features::kDnsOverHttps, "method"));
-+
-+    base::Value spec(dnsOverHttpsServer);
-+    base::Value method("POST");
-+
-     if (spec.GetString().size() > 0) {
-       specs.GetList().push_back(std::move(spec));
-       methods.GetList().push_back(std::move(method));
-diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
--- a/components/network_session_configurator/common/network_features.cc
-+++ b/components/network_session_configurator/common/network_features.cc
-@@ -9,7 +9,8 @@ namespace features {
- const base::Feature kTokenBinding{"token-binding",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
- 
-const base::Feature kDnsOverHttps{"dns-over-https",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
-+const char kDnsOverHttpsChoiceDefault[] = "Disabled",
-+                 kDnsOverHttpsChoiceGoogle[] = "Google",
-+                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare";
- 
- }  // namespace features
-diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
--- a/components/network_session_configurator/common/network_features.h
-+++ b/components/network_session_configurator/common/network_features.h
-@@ -14,9 +14,10 @@ namespace features {
- // (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
- 
-// Enabled DNS over HTTPS
-+// DNS over HTTPS server endpoint choices
- // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
-NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
-+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
-+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[];
- 
- }  // namespace features
- 
-diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
--- a/components/network_session_configurator/common/network_switch_list.h
-+++ b/components/network_session_configurator/common/network_switch_list.h
-@@ -35,6 +35,10 @@ NETWORK_SWITCH(kOriginToForceQuicOn, "origin-to-force-quic-on")
- // the server.
- NETWORK_SWITCH(kQuicConnectionOptions, "quic-connection-options")
- 
-+// Specifies an IETF DNS-over-HTTPS server endpoint
-+// (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
-+NETWORK_SWITCH(kDnsOverHttpsServer, "dns-over-https-server")
-+
- // Specifies the maximum length for a QUIC packet.
- NETWORK_SWITCH(kQuicMaxPacketLength, "quic-max-packet-length")
- 
-diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
--- a/net/base/load_flags_list.h
-+++ b/net/base/load_flags_list.h
-@@ -92,3 +92,9 @@ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION, 1 << 16)
- // Indicates that the cache should not check that the request matches the
- // response's vary header.
- LOAD_FLAG(SKIP_VARY_CHECK, 1 << 17)
-+
-+// This load will not send Accept-Language or User-Agent headers, and not
-+// advertise brotli encoding.
-+// Used to comply with IETF (draft) DNS-over-HTTPS:
-+// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests."
-+LOAD_FLAG(MINIMAL_HEADERS, 1 << 18)
-diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
--- a/net/dns/dns_transaction.cc
-+++ b/net/dns/dns_transaction.cc
-@@ -391,30 +391,8 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
- 
-     HttpRequestHeaders extra_request_headers;
-     extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType);
-
-    request_ = url_request_context->CreateRequest(
-        url, request_priority_, this,
-        net::DefineNetworkTrafficAnnotation("dns_over_https", R"(
-        semantics {
-          sender: "DNS over HTTPS"
-          description: "Domain name resolution over HTTPS"
-          trigger: "User enters a navigates to a domain or Chrome otherwise "
-                   "makes a connection to a domain whose IP address isn't cached"
-          data: "The domain name that is being requested"
-          destination: OTHER
-          destination_other: "The user configured DNS over HTTPS server, which"
-                             "may be dns.google.com"
-        }
-        policy {
-          cookies_allowed: NO
-          setting:
-            "You can configure this feature via that 'dns_over_https_servers' and"
-            "'dns_over_https.method' prefs. Empty lists imply this feature is"
-            "disabled"
-          policy_exception_justification: "Experimental feature that"
-                                          "is disabled by default"
-        }
-      )"));
-+    //extra_request_headers.SetHeader(HttpRequestHeaders::kUserAgent, "DoH client");
-+    request_ = url_request_context->CreateRequest(url, request_priority_, this);
-     net_log_ = request_->net_log();
- 
-     if (use_post) {
-@@ -432,6 +410,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
-     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
-                            LOAD_BYPASS_PROXY | LOAD_DO_NOT_SEND_COOKIES |
-                            LOAD_DO_NOT_SAVE_COOKIES |
-+                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
-                            LOAD_DO_NOT_SEND_AUTH_DATA);
-   }
- 
-@@ -851,7 +830,7 @@ class DnsTransactionImpl : public DnsTransaction,
-         had_tcp_attempt_(false),
-         doh_attempt_(false),
-         first_server_index_(0),
-        request_priority_(DEFAULT_PRIORITY) {
-+        request_priority_(MAXIMUM_PRIORITY) {
-     DCHECK(session_.get());
-     DCHECK(!hostname_.empty());
-     DCHECK(!callback_.is_null());
-diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
--- a/net/url_request/url_request_http_job.cc
-+++ b/net/url_request/url_request_http_job.cc
-@@ -434,19 +434,23 @@ void URLRequestHttpJob::Start() {
-   // plugin could set a referrer although sending the referrer is inhibited.
-   request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
- 
-  // Our consumer should have made sure that this is a safe referrer. See for
-  // instance WebCore::FrameLoader::HideReferrer.
-  if (referrer.is_valid()) {
-    request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
-                                          referrer.spec());
-+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
-+    // Our consumer should have made sure that this is a safe referrer. See for
-+    // instance WebCore::FrameLoader::HideReferrer.
-+    if (referrer.is_valid()) {
-+      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
-+                                            referrer.spec());
-+    }
-   }
- 
-   request_info_.token_binding_referrer = request_->token_binding_referrer();
- 
-  request_info_.extra_headers.SetHeaderIfMissing(
-+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
-+    request_info_.extra_headers.SetHeaderIfMissing(
-       HttpRequestHeaders::kUserAgent,
-       http_user_agent_settings_ ?
-           http_user_agent_settings_->GetUserAgent() : std::string());
-+  }
- 
-   AddExtraHeaders();
-   AddCookieHeaderAndStart();
-@@ -663,10 +667,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
-           HttpRequestHeaders::kAcceptEncoding)) {
-     // Advertise "br" encoding only if transferred data is opaque to proxy.
-     bool advertise_brotli = false;
-    if (request()->context()->enable_brotli()) {
-      if (request()->url().SchemeIsCryptographic() ||
-          IsLocalhost(request()->url())) {
-        advertise_brotli = true;
-+    if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
-+      if (request()->context()->enable_brotli()) {
-+        if (request()->url().SchemeIsCryptographic() ||
-+            IsLocalhost(request()->url())) {
-+          advertise_brotli = true;
-+        }
-       }
-     }
- 
-@@ -683,7 +689,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
-                                           advertised_encodings);
-   }
- 
-  if (http_user_agent_settings_) {
-+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS) && http_user_agent_settings_) {
-     // Only add default Accept-Language if the request didn't have it
-     // specified.
-     std::string accept_language =
-- 
-2.7.4
-
@@ -1,46 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 5 Jun 2018 13:46:40 +0200
-Subject: Always respect async dns flag (regardless of SDK version)
-
-Do not read experiment value for cronet async DNS configuration
---
- chrome/browser/io_thread.cc                     | 10 +---------
- components/cronet/url_request_context_config.cc |  3 ++-
- 2 files changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
--- a/chrome/browser/io_thread.cc
-+++ b/chrome/browser/io_thread.cc
-@@ -258,15 +258,7 @@ void UpdateMetricsUsagePrefsOnUIThread(const std::string& service_name,
- // Check the AsyncDns field trial and return true if it should be enabled. On
- // Android this includes checking the Android version in the field trial.
- bool ShouldEnableAsyncDns() {
-  bool feature_can_be_enabled = true;
-#if defined(OS_ANDROID)
-  int min_sdk =
-      base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0);
-  if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk)
-    feature_can_be_enabled = false;
-#endif
-  return feature_can_be_enabled &&
-         base::FeatureList::IsEnabled(features::kAsyncDns);
-+  return base::FeatureList::IsEnabled(features::kAsyncDns);
- }
- 
- }  // namespace
-diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
--- a/components/cronet/url_request_context_config.cc
-+++ b/components/cronet/url_request_context_config.cc
-@@ -398,7 +398,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
-         effective_experimental_options->Remove(it.key(), nullptr);
-         continue;
-       }
-      async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
-+      bool ignored;
-+      async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored);
-     } else if (it.key() == kStaleDnsFieldTrialName) {
-       const base::DictionaryValue* stale_dns_args = nullptr;
-       if (!it.value().GetAsDictionary(&stale_dns_args)) {
-- 
-2.7.4
-
@@ -1,28 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 2 May 2018 01:04:07 +0200
-Subject: Disable custom tab activities permanently
-
---
- .../src/org/chromium/chrome/browser/LaunchIntentDispatcher.java    | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -149,9 +149,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
-         recordIntentMetrics();
- 
-         mIsVrIntent = VrIntentUtils.isVrIntent(mIntent);
-        boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
-                || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
-        mIsCustomTabIntent = isCustomTabIntent;
-+        //boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
-+        //        || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
-+        //mIsCustomTabIntent = isCustomTabIntent;
-+        mIsCustomTabIntent = false;
-     }
- 
-     /**
-- 
-2.7.4
-
@@ -1,37 +0,0 @@
-From: samartnik <artem@brave.com>
-Date: Thu, 14 Dec 2017 16:19:50 +0200
-Subject: Always allow partner customisation
-
---
- .../PartnerBrowserCustomizations.java                    | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
-             @Override
-             protected Void doInBackground(Void... params) {
-                 try {
-                    boolean systemOrPreStable =
-                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
-                            || !ChromeVersionInfo.isStableBuild();
-                    if (!systemOrPreStable) {
-                        // Only allow partner customization if this browser is a system package, or
-                        // is in pre-stable channels.
-                        return null;
-                    }
-+                    //boolean systemOrPreStable =
-+                    //        (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
-+                    //        || !ChromeVersionInfo.isStableBuild();
-+                    //if (!systemOrPreStable) {
-+                    //    // Only allow partner customization if this browser is a system package, or
-+                    //    // is in pre-stable channels.
-+                    //    return null;
-+                    //}
- 
-                     if (isCancelled()) return null;
-                     refreshIncognitoModeDisabled();
-- 
-2.7.4
-
@@ -0,0 +1,26 @@
+From ee80624a6cad6e19a281a59cfea32f406e7ee03d Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Thu, 26 Jan 2017 01:30:12 -0500
+Subject: [PATCH 12/21] use 64-bit WebView processes
+
+---
+ android_webview/apk/java/AndroidManifest.xml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
+index 23b55ecb437a..3f7212fe2807 100644
+--- a/android_webview/apk/java/AndroidManifest.xml
+++ b/android_webview/apk/java/AndroidManifest.xml
+@@ -20,8 +20,7 @@
+ 
+     <application android:label="Android System WebView"
+                  android:icon="@drawable/icon_webview"
+-                 android:multiArch="true"
+-                 android:use32bitAbi="true">
+                 android:multiArch="true">
+         {# This part is shared between stand-alone WebView and Monochrome #}
+         {% macro common(manifest_package, webview_lib) %}
+             <meta-data android:name="com.android.webview.WebViewLibrary"
+-- 
+2.14.2
+
@@ -1,17 +1,20 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 11:06:18 +0200
-Subject: Add DuckDuckGo search engine
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 11:06:18 2017 +0200

---
- .../search_engines/prepopulated_engines.json       |  19 ++
- components/search_engines/search_engine_type.h     |   2 +
- .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 130 insertions(+), 109 deletions(-)
+    Add DuckDuckGo search engine, not enabled by default

 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
+index 002b6c0..7b4155b 100644
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -38,6 +38,25 @@
+@@ -32,12 +32,22 @@
+ 
+     // Increment this if you change the data in ways that mean users with
+     // existing data should get a new version.
+-    "kCurrentDataVersion": 99
+    "kCurrentDataVersion": 100
+   },
+ 
   // The following engines are included in country lists and are added to the
   // list of search engines on the first run depending on user's country.
   "elements": {
@@ -20,696 +23,685 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
 +      "keyword": "duckduckgo.com",
 +      "favicon_url": "https://duckduckgo.com/favicon.ico",
 +      "search_url": "https://duckduckgo.com/?q={searchTerms}",
-+      "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list",
+      "new_tab_url": "https://duckduckgo.com/",
 +      "type": "SEARCH_ENGINE_DUCKDUCKGO",
 +      "id": 11
 +    },
-+
-+    "duckduckgo_light": {
-+      "name": "DuckDuckGo Light",
-+      "keyword": "duckduckgo.com/lite",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
-+      "id": 12
-+    },
 +
     "aol": {
       "name": "AOL",
       "keyword": "aol.com",
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
+index c19dd0e..02f6b16 100644
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -63,6 +63,8 @@ enum SearchEngineType {
+@@ -63,6 +63,7 @@ enum SearchEngineType {
   SEARCH_ENGINE_YANDEX,
   SEARCH_ENGINE_ZOZNAM,
   SEARCH_ENGINE_360,
 +  SEARCH_ENGINE_DUCKDUCKGO,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT,
   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
 };
 
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
+index 6be17ee..ef50529 100644
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -51,548 +51,548 @@ namespace {
+@@ -50,548 +50,548 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // United Arab Emirates
 const PrepopulatedEngine* const engines_AE[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Albania
 const PrepopulatedEngine* const engines_AL[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Argentina
 const PrepopulatedEngine* const engines_AR[] = {
 -    &google, &bing, &yahoo_ar,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
+    &google, &duckduckgo, &bing, &yahoo_ar,
 };
 
 // Austria
 const PrepopulatedEngine* const engines_AT[] = {
 -    &google, &bing, &yahoo_at,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
+    &google, &duckduckgo, &bing, &yahoo_at,
 };
 
 // Australia
 const PrepopulatedEngine* const engines_AU[] = {
 -    &google, &bing, &yahoo_au,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
+    &google, &duckduckgo, &bing, &yahoo_au,
 };
 
 // Bosnia and Herzegovina
 const PrepopulatedEngine* const engines_BA[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Belgium
 const PrepopulatedEngine* const engines_BE[] = {
 -    &google, &bing, &yahoo, &yahoo_fr,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
+    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
 };
 
 // Bulgaria
 const PrepopulatedEngine* const engines_BG[] = {
 -    &google, &bing, &ask,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
+    &google, &duckduckgo, &bing, &ask,
 };
 
 // Bahrain
 const PrepopulatedEngine* const engines_BH[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Burundi
 const PrepopulatedEngine* const engines_BI[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Brunei
 const PrepopulatedEngine* const engines_BN[] = {
 -    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+    &google, &duckduckgo, &yahoo_my, &bing,
 };
 
 // Bolivia
 const PrepopulatedEngine* const engines_BO[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Brazil
 const PrepopulatedEngine* const engines_BR[] = {
 -    &google, &ask_br, &bing, &yahoo_br,
-+    &google, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
+    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
 };
 
 // Belarus
 const PrepopulatedEngine* const engines_BY[] = {
 -    &google, &yandex_by, &mail_ru,
-+    &google, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
+    &google, &duckduckgo, &yandex_by, &mail_ru,
 };
 
 // Belize
 const PrepopulatedEngine* const engines_BZ[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Canada
 const PrepopulatedEngine* const engines_CA[] = {
 -    &google, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
+    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
 };
 
 // Switzerland
 const PrepopulatedEngine* const engines_CH[] = {
 -    &google, &bing, &yahoo_ch,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
+    &google, &duckduckgo, &bing, &yahoo_ch,
 };
 
 // Chile
 const PrepopulatedEngine* const engines_CL[] = {
 -    &google, &bing, &yahoo_cl,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
+    &google, &duckduckgo, &bing, &yahoo_cl,
 };
 
 // China
 const PrepopulatedEngine* const engines_CN[] = {
 -    &google, &baidu, &sogou, &so_360,
-+    &google, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
+    &google, &duckduckgo, &baidu, &sogou, &so_360,
 };
 
 // Colombia
 const PrepopulatedEngine* const engines_CO[] = {
 -    &google, &bing, &yahoo_co,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
+    &google, &duckduckgo, &bing, &yahoo_co,
 };
 
 // Costa Rica
 const PrepopulatedEngine* const engines_CR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Czech Republic
 const PrepopulatedEngine* const engines_CZ[] = {
 -    &google, &seznam, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &seznam, &bing,
+    &google, &duckduckgo, &seznam, &bing,
 };
 
 // Germany
 const PrepopulatedEngine* const engines_DE[] = {
 -    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+    &google, &duckduckgo, &bing, &yahoo_de,
 };
 
 // Denmark
 const PrepopulatedEngine* const engines_DK[] = {
 -    &google, &bing, &yahoo_dk,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
+    &google, &duckduckgo, &bing, &yahoo_dk,
 };
 
 // Dominican Republic
 const PrepopulatedEngine* const engines_DO[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Algeria
 const PrepopulatedEngine* const engines_DZ[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &bing, &yahoo_maktoob,
 };
 
 // Ecuador
 const PrepopulatedEngine* const engines_EC[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Estonia
 const PrepopulatedEngine* const engines_EE[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Egypt
 const PrepopulatedEngine* const engines_EG[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Spain
 const PrepopulatedEngine* const engines_ES[] = {
 -    &google, &bing, &yahoo_es,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
+    &google, &duckduckgo, &bing, &yahoo_es,
 };
 
 // Faroe Islands
 const PrepopulatedEngine* const engines_FO[] = {
 -    &google, &bing, &ask,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
+    &google, &duckduckgo, &bing, &ask,
 };
 
 // Finland
 const PrepopulatedEngine* const engines_FI[] = {
 -    &google, &bing, &yahoo_fi,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
+    &google, &duckduckgo, &bing, &yahoo_fi,
 };
 
 // France
 const PrepopulatedEngine* const engines_FR[] = {
 -    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+    &google, &duckduckgo, &bing, &yahoo_fr,
 };
 
 // United Kingdom
 const PrepopulatedEngine* const engines_GB[] = {
 -    &google, &bing, &yahoo_uk, &ask_uk,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
+    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
 };
 
 // Greece
 const PrepopulatedEngine* const engines_GR[] = {
 -    &google, &bing, &yahoo_gr,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
+    &google, &duckduckgo, &bing, &yahoo_gr,
 };
 
 // Guatemala
 const PrepopulatedEngine* const engines_GT[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Hong Kong
 const PrepopulatedEngine* const engines_HK[] = {
 -    &google, &yahoo_hk, &baidu, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
+    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
 };
 
 // Honduras
 const PrepopulatedEngine* const engines_HN[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Croatia
 const PrepopulatedEngine* const engines_HR[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Hungary
 const PrepopulatedEngine* const engines_HU[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Indonesia
 const PrepopulatedEngine* const engines_ID[] = {
 -    &google, &yahoo_id, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
+    &google, &duckduckgo, &yahoo_id, &bing,
 };
 
 // Ireland
 const PrepopulatedEngine* const engines_IE[] = {
 -    &google, &bing, &yahoo_uk,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
+    &google, &duckduckgo, &bing, &yahoo_uk,
 };
 
 // Israel
 const PrepopulatedEngine* const engines_IL[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // India
 const PrepopulatedEngine* const engines_IN[] = {
 -    &google, &bing, &yahoo_in,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
+    &google, &duckduckgo, &bing, &yahoo_in,
 };
 
 // Iraq
 const PrepopulatedEngine* const engines_IQ[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Iran
 const PrepopulatedEngine* const engines_IR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Iceland
 const PrepopulatedEngine* const engines_IS[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Italy
 const PrepopulatedEngine* const engines_IT[] = {
 -    &google, &virgilio, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
+    &google, &duckduckgo, &virgilio, &bing,
 };
 
 // Jamaica
 const PrepopulatedEngine* const engines_JM[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Jordan
 const PrepopulatedEngine* const engines_JO[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Japan
 const PrepopulatedEngine* const engines_JP[] = {
 -    &google, &yahoo_jp, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
+    &google, &duckduckgo, &yahoo_jp, &bing,
 };
 
 // Kenya
 const PrepopulatedEngine* const engines_KE[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Kuwait
 const PrepopulatedEngine* const engines_KW[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // South Korea
 const PrepopulatedEngine* const engines_KR[] = {
 -    &google, &naver, &daum,
-+    &google, &duckduckgo, &duckduckgo_light, &naver, &daum,
+    &google, &duckduckgo, &naver, &daum,
 };
 
 // Kazakhstan
 const PrepopulatedEngine* const engines_KZ[] = {
 -    &google, &mail_ru, &yandex_kz,
-+    &google, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
+    &google, &duckduckgo, &mail_ru, &yandex_kz,
 };
 
 // Lebanon
 const PrepopulatedEngine* const engines_LB[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Liechtenstein
 const PrepopulatedEngine* const engines_LI[] = {
 -    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+    &google, &duckduckgo, &bing, &yahoo_de,
 };
 
 // Lithuania
 const PrepopulatedEngine* const engines_LT[] = {
 -    &google, &bing, &yandex_ru,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
+    &google, &duckduckgo, &bing, &yandex_ru,
 };
 
 // Luxembourg
 const PrepopulatedEngine* const engines_LU[] = {
 -    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+    &google, &duckduckgo, &bing, &yahoo_fr,
 };
 
 // Latvia
 const PrepopulatedEngine* const engines_LV[] = {
 -    &google, &yandex_ru, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
+    &google, &duckduckgo, &yandex_ru, &bing,
 };
 
 // Libya
 const PrepopulatedEngine* const engines_LY[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Morocco
 const PrepopulatedEngine* const engines_MA[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &bing, &yahoo_maktoob,
 };
 
 // Monaco
 const PrepopulatedEngine* const engines_MC[] = {
 -    &google, &yahoo_fr, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
+    &google, &duckduckgo, &yahoo_fr, &bing,
 };
 
 // Moldova
 const PrepopulatedEngine* const engines_MD[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Montenegro
 const PrepopulatedEngine* const engines_ME[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Macedonia
 const PrepopulatedEngine* const engines_MK[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Mexico
 const PrepopulatedEngine* const engines_MX[] = {
 -    &google, &bing, &yahoo_mx,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
+    &google, &duckduckgo, &bing, &yahoo_mx,
 };
 
 // Malaysia
 const PrepopulatedEngine* const engines_MY[] = {
 -    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+    &google, &duckduckgo, &yahoo_my, &bing,
 };
 
 // Nicaragua
 const PrepopulatedEngine* const engines_NI[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Netherlands
 const PrepopulatedEngine* const engines_NL[] = {
 -    &google, &yahoo_nl, &vinden,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
+    &google, &duckduckgo, &yahoo_nl, &vinden,
 };
 
 // Norway
 const PrepopulatedEngine* const engines_NO[] = {
 -    &google, &bing, &kvasir,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
+    &google, &duckduckgo, &bing, &kvasir,
 };
 
 // New Zealand
 const PrepopulatedEngine* const engines_NZ[] = {
 -    &google, &bing, &yahoo_nz,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
+    &google, &duckduckgo, &bing, &yahoo_nz,
 };
 
 // Oman
 const PrepopulatedEngine* const engines_OM[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &bing, &yahoo_maktoob,
 };
 
 // Panama
 const PrepopulatedEngine* const engines_PA[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Peru
 const PrepopulatedEngine* const engines_PE[] = {
 -    &google, &bing, &yahoo_pe,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
+    &google, &duckduckgo, &bing, &yahoo_pe,
 };
 
 // Philippines
 const PrepopulatedEngine* const engines_PH[] = {
 -    &google, &yahoo_ph, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
+    &google, &duckduckgo, &yahoo_ph, &bing,
 };
 
 // Pakistan
 const PrepopulatedEngine* const engines_PK[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Puerto Rico
 const PrepopulatedEngine* const engines_PR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Poland
 const PrepopulatedEngine* const engines_PL[] = {
 -    &google, &onet, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &onet, &bing,
+    &google, &duckduckgo, &onet, &bing,
 };
 
 // Portugal
 const PrepopulatedEngine* const engines_PT[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Paraguay
 const PrepopulatedEngine* const engines_PY[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Qatar
 const PrepopulatedEngine* const engines_QA[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Romania
 const PrepopulatedEngine* const engines_RO[] = {
 -    &google, &yahoo_ro, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
+    &google, &duckduckgo, &yahoo_ro, &bing,
 };
 
 // Serbia
 const PrepopulatedEngine* const engines_RS[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Russia
 const PrepopulatedEngine* const engines_RU[] = {
 -    &google, &yandex_ru, &mail_ru,
-+    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
+    &google, &duckduckgo, &yandex_ru, &mail_ru,
 };
 
 // Rwanda
 const PrepopulatedEngine* const engines_RW[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Saudi Arabia
 const PrepopulatedEngine* const engines_SA[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &yahoo_maktoob, &bing,
 };
 
 // Sweden
 const PrepopulatedEngine* const engines_SE[] = {
 -    &google, &bing, &yahoo_se,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
+    &google, &duckduckgo, &bing, &yahoo_se,
 };
 
 // Singapore
 const PrepopulatedEngine* const engines_SG[] = {
 -    &google, &yahoo_sg, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
+    &google, &duckduckgo, &yahoo_sg, &bing,
 };
 
 // Slovenia
 const PrepopulatedEngine* const engines_SI[] = {
 -    &google, &najdi, &ask,
-+    &google, &duckduckgo, &duckduckgo_light, &najdi, &ask,
+    &google, &duckduckgo, &najdi, &ask,
 };
 
 // Slovakia
 const PrepopulatedEngine* const engines_SK[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // El Salvador
 const PrepopulatedEngine* const engines_SV[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Syria
 const PrepopulatedEngine* const engines_SY[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &bing, &yahoo_maktoob,
 };
 
 // Thailand
 const PrepopulatedEngine* const engines_TH[] = {
 -    &google, &yahoo_th, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
+    &google, &duckduckgo, &yahoo_th, &bing,
 };
 
 // Tunisia
 const PrepopulatedEngine* const engines_TN[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &bing, &yahoo_maktoob,
 };
 
 // Turkey
 const PrepopulatedEngine* const engines_TR[] = {
 -    &google, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
+    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
 };
 
 // Trinidad and Tobago
 const PrepopulatedEngine* const engines_TT[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Taiwan
 const PrepopulatedEngine* const engines_TW[] = {
 -    &google, &yahoo_tw, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
+    &google, &duckduckgo, &yahoo_tw, &bing,
 };
 
 // Tanzania
 const PrepopulatedEngine* const engines_TZ[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &duckduckgo, &yahoo, &bing,
 };
 
 // Ukraine
 const PrepopulatedEngine* const engines_UA[] = {
 -    &google, &yandex_ua, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
+    &google, &duckduckgo, &yandex_ua, &bing,
 };
 
 // United States
 const PrepopulatedEngine* const engines_US[] = {
 -    &google, &bing, &yahoo, &aol, &ask,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
+    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
 };
 
 // Uruguay
 const PrepopulatedEngine* const engines_UY[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Venezuela
 const PrepopulatedEngine* const engines_VE[] = {
 -    &google, &bing, &yahoo_ve,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
+    &google, &duckduckgo, &bing, &yahoo_ve,
 };
 
 // Vietnam
 const PrepopulatedEngine* const engines_VN[] = {
 -    &google, &yahoo_vn, &bing,
-+    &google, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
+    &google, &duckduckgo, &yahoo_vn, &bing,
 };
 
 // Yemen
 const PrepopulatedEngine* const engines_YE[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &bing, &yahoo_maktoob,
 };
 
 // South Africa
 const PrepopulatedEngine* const engines_ZA[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &duckduckgo, &bing, &yahoo,
 };
 
 // Zimbabwe
 const PrepopulatedEngine* const engines_ZW[] = {
 -    &google, &bing, &yahoo, &ask,
-+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
+    &google, &duckduckgo, &bing, &yahoo, &ask,
 };
 
 // A list of all the engines that we know about.
 const PrepopulatedEngine* const kAllEngines[] = {
     // Prepopulated engines:
 -    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &duckduckgo_light, &kvasir,
+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &kvasir,
     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
-- 
-2.7.4
-
@@ -0,0 +1,717 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Dec 11 22:42:11 2017 +0100
+
+    Added Google English-only engine, no RLZ and field experiments
+
+diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
+--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
+@@ -32,7 +32,7 @@
+ 
+     // Increment this if you change the data in ways that mean users with
+     // existing data should get a new version.
+-    "kCurrentDataVersion": 101
+    "kCurrentDataVersion": 102
+   },
+ 
+   // The following engines are included in country lists and are added to the
+@@ -141,6 +141,27 @@
+       "id": 1
+     },
+ 
+    "googleen": {
+      "name": "GoogleEN",
+      "keyword": "google.co.uk",
+      "favicon_url": "https://www.google.com/favicon.ico",
+      "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en",
+      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en",
+      "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
+      "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
+      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
+      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
+      "alternate_urls": [
+        "{google:baseURL}?hl=en#q={searchTerms}",
+        "{google:baseURL}search?hl=en#q={searchTerms}",
+        "{google:baseURL}webhp?hl=en#q={searchTerms}",
+        "{google:baseURL}s?hl=en#q={searchTerms}",
+        "{google:baseURL}s?hl=en&q={searchTerms}"
+      ],
+      "type": "SEARCH_ENGINE_GOOGLE_EN",
+      "id": 13
+    },
+
+     "kvasir": {
+       "name": "Kvasir",
+       "keyword": "kvasir.no",
+diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
+--- a/components/search_engines/search_engine_type.h
+++ b/components/search_engines/search_engine_type.h
+@@ -65,6 +65,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_360,
+   SEARCH_ENGINE_DUCKDUCKGO,
+   SEARCH_ENGINE_STARTPAGE,
+  SEARCH_ENGINE_GOOGLE_EN,
+   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
+ };
+ 
+diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
+--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
+@@ -50,548 +50,548 @@ namespace {
+ 
+ // Default (for countries with no better engine set)
+ const PrepopulatedEngine* const engines_default[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // United Arab Emirates
+ const PrepopulatedEngine* const engines_AE[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Albania
+ const PrepopulatedEngine* const engines_AL[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Argentina
+ const PrepopulatedEngine* const engines_AR[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
+ };
+ 
+ // Austria
+ const PrepopulatedEngine* const engines_AT[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_at,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_at,
+ };
+ 
+ // Australia
+ const PrepopulatedEngine* const engines_AU[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_au,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_au,
+ };
+ 
+ // Bosnia and Herzegovina
+ const PrepopulatedEngine* const engines_BA[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Belgium
+ const PrepopulatedEngine* const engines_BE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
+ };
+ 
+ // Bulgaria
+ const PrepopulatedEngine* const engines_BG[] = {
+-    &google, &startpage, &duckduckgo, &bing, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &ask,
+ };
+ 
+ // Bahrain
+ const PrepopulatedEngine* const engines_BH[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Burundi
+ const PrepopulatedEngine* const engines_BI[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Brunei
+ const PrepopulatedEngine* const engines_BN[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_my, &bing,
+ };
+ 
+ // Bolivia
+ const PrepopulatedEngine* const engines_BO[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Brazil
+ const PrepopulatedEngine* const engines_BR[] = {
+-    &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
+    &googleen, &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
+ };
+ 
+ // Belarus
+ const PrepopulatedEngine* const engines_BY[] = {
+-    &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
+    &googleen, &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
+ };
+ 
+ // Belize
+ const PrepopulatedEngine* const engines_BZ[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Canada
+ const PrepopulatedEngine* const engines_CA[] = {
+-    &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
+ };
+ 
+ // Switzerland
+ const PrepopulatedEngine* const engines_CH[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
+ };
+ 
+ // Chile
+ const PrepopulatedEngine* const engines_CL[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
+ };
+ 
+ // China
+ const PrepopulatedEngine* const engines_CN[] = {
+-    &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
+    &googleen, &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
+ };
+ 
+ // Colombia
+ const PrepopulatedEngine* const engines_CO[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_co,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_co,
+ };
+ 
+ // Costa Rica
+ const PrepopulatedEngine* const engines_CR[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Czech Republic
+ const PrepopulatedEngine* const engines_CZ[] = {
+-    &google, &startpage, &duckduckgo, &seznam, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &seznam, &bing,
+ };
+ 
+ // Germany
+ const PrepopulatedEngine* const engines_DE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_de,
+ };
+ 
+ // Denmark
+ const PrepopulatedEngine* const engines_DK[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
+ };
+ 
+ // Dominican Republic
+ const PrepopulatedEngine* const engines_DO[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Algeria
+ const PrepopulatedEngine* const engines_DZ[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Ecuador
+ const PrepopulatedEngine* const engines_EC[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Estonia
+ const PrepopulatedEngine* const engines_EE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Egypt
+ const PrepopulatedEngine* const engines_EG[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Spain
+ const PrepopulatedEngine* const engines_ES[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_es,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_es,
+ };
+ 
+ // Faroe Islands
+ const PrepopulatedEngine* const engines_FO[] = {
+-    &google, &startpage, &duckduckgo, &bing, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &ask,
+ };
+ 
+ // Finland
+ const PrepopulatedEngine* const engines_FI[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
+ };
+ 
+ // France
+ const PrepopulatedEngine* const engines_FR[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
+ };
+ 
+ // United Kingdom
+ const PrepopulatedEngine* const engines_GB[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
+ };
+ 
+ // Greece
+ const PrepopulatedEngine* const engines_GR[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
+ };
+ 
+ // Guatemala
+ const PrepopulatedEngine* const engines_GT[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Hong Kong
+ const PrepopulatedEngine* const engines_HK[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
+ };
+ 
+ // Honduras
+ const PrepopulatedEngine* const engines_HN[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Croatia
+ const PrepopulatedEngine* const engines_HR[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Hungary
+ const PrepopulatedEngine* const engines_HU[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Indonesia
+ const PrepopulatedEngine* const engines_ID[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_id, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_id, &bing,
+ };
+ 
+ // Ireland
+ const PrepopulatedEngine* const engines_IE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
+ };
+ 
+ // Israel
+ const PrepopulatedEngine* const engines_IL[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // India
+ const PrepopulatedEngine* const engines_IN[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_in,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_in,
+ };
+ 
+ // Iraq
+ const PrepopulatedEngine* const engines_IQ[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Iran
+ const PrepopulatedEngine* const engines_IR[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Iceland
+ const PrepopulatedEngine* const engines_IS[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Italy
+ const PrepopulatedEngine* const engines_IT[] = {
+-    &google, &startpage, &duckduckgo, &virgilio, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &virgilio, &bing,
+ };
+ 
+ // Jamaica
+ const PrepopulatedEngine* const engines_JM[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Jordan
+ const PrepopulatedEngine* const engines_JO[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Japan
+ const PrepopulatedEngine* const engines_JP[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
+ };
+ 
+ // Kenya
+ const PrepopulatedEngine* const engines_KE[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Kuwait
+ const PrepopulatedEngine* const engines_KW[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // South Korea
+ const PrepopulatedEngine* const engines_KR[] = {
+-    &google, &startpage, &duckduckgo, &naver, &daum,
+    &googleen, &google, &startpage, &duckduckgo, &naver, &daum,
+ };
+ 
+ // Kazakhstan
+ const PrepopulatedEngine* const engines_KZ[] = {
+-    &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
+    &googleen, &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
+ };
+ 
+ // Lebanon
+ const PrepopulatedEngine* const engines_LB[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Liechtenstein
+ const PrepopulatedEngine* const engines_LI[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_de,
+ };
+ 
+ // Lithuania
+ const PrepopulatedEngine* const engines_LT[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yandex_ru,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yandex_ru,
+ };
+ 
+ // Luxembourg
+ const PrepopulatedEngine* const engines_LU[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
+ };
+ 
+ // Latvia
+ const PrepopulatedEngine* const engines_LV[] = {
+-    &google, &startpage, &duckduckgo, &yandex_ru, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yandex_ru, &bing,
+ };
+ 
+ // Libya
+ const PrepopulatedEngine* const engines_LY[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Morocco
+ const PrepopulatedEngine* const engines_MA[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Monaco
+ const PrepopulatedEngine* const engines_MC[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
+ };
+ 
+ // Moldova
+ const PrepopulatedEngine* const engines_MD[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Montenegro
+ const PrepopulatedEngine* const engines_ME[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Macedonia
+ const PrepopulatedEngine* const engines_MK[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Mexico
+ const PrepopulatedEngine* const engines_MX[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
+ };
+ 
+ // Malaysia
+ const PrepopulatedEngine* const engines_MY[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_my, &bing,
+ };
+ 
+ // Nicaragua
+ const PrepopulatedEngine* const engines_NI[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Netherlands
+ const PrepopulatedEngine* const engines_NL[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
+ };
+ 
+ // Norway
+ const PrepopulatedEngine* const engines_NO[] = {
+-    &google, &startpage, &duckduckgo, &bing, &kvasir,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &kvasir,
+ };
+ 
+ // New Zealand
+ const PrepopulatedEngine* const engines_NZ[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
+ };
+ 
+ // Oman
+ const PrepopulatedEngine* const engines_OM[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Panama
+ const PrepopulatedEngine* const engines_PA[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Peru
+ const PrepopulatedEngine* const engines_PE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
+ };
+ 
+ // Philippines
+ const PrepopulatedEngine* const engines_PH[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
+ };
+ 
+ // Pakistan
+ const PrepopulatedEngine* const engines_PK[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Puerto Rico
+ const PrepopulatedEngine* const engines_PR[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Poland
+ const PrepopulatedEngine* const engines_PL[] = {
+-    &google, &startpage, &duckduckgo, &onet, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &onet, &bing,
+ };
+ 
+ // Portugal
+ const PrepopulatedEngine* const engines_PT[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Paraguay
+ const PrepopulatedEngine* const engines_PY[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Qatar
+ const PrepopulatedEngine* const engines_QA[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Romania
+ const PrepopulatedEngine* const engines_RO[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
+ };
+ 
+ // Serbia
+ const PrepopulatedEngine* const engines_RS[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Russia
+ const PrepopulatedEngine* const engines_RU[] = {
+-    &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
+    &googleen, &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
+ };
+ 
+ // Rwanda
+ const PrepopulatedEngine* const engines_RW[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Saudi Arabia
+ const PrepopulatedEngine* const engines_SA[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Sweden
+ const PrepopulatedEngine* const engines_SE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_se,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_se,
+ };
+ 
+ // Singapore
+ const PrepopulatedEngine* const engines_SG[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
+ };
+ 
+ // Slovenia
+ const PrepopulatedEngine* const engines_SI[] = {
+-    &google, &startpage, &duckduckgo, &najdi, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &najdi, &ask,
+ };
+ 
+ // Slovakia
+ const PrepopulatedEngine* const engines_SK[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // El Salvador
+ const PrepopulatedEngine* const engines_SV[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Syria
+ const PrepopulatedEngine* const engines_SY[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Thailand
+ const PrepopulatedEngine* const engines_TH[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_th, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_th, &bing,
+ };
+ 
+ // Tunisia
+ const PrepopulatedEngine* const engines_TN[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Turkey
+ const PrepopulatedEngine* const engines_TR[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
+ };
+ 
+ // Trinidad and Tobago
+ const PrepopulatedEngine* const engines_TT[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Taiwan
+ const PrepopulatedEngine* const engines_TW[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
+ };
+ 
+ // Tanzania
+ const PrepopulatedEngine* const engines_TZ[] = {
+-    &google, &startpage, &duckduckgo, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Ukraine
+ const PrepopulatedEngine* const engines_UA[] = {
+-    &google, &startpage, &duckduckgo, &yandex_ua, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yandex_ua, &bing,
+ };
+ 
+ // United States
+ const PrepopulatedEngine* const engines_US[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
+ };
+ 
+ // Uruguay
+ const PrepopulatedEngine* const engines_UY[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Venezuela
+ const PrepopulatedEngine* const engines_VE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
+ };
+ 
+ // Vietnam
+ const PrepopulatedEngine* const engines_VN[] = {
+-    &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
+ };
+ 
+ // Yemen
+ const PrepopulatedEngine* const engines_YE[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // South Africa
+ const PrepopulatedEngine* const engines_ZA[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Zimbabwe
+ const PrepopulatedEngine* const engines_ZW[] = {
+-    &google, &startpage, &duckduckgo, &bing, &yahoo, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo, &ask,
+ };
+ 
+ // A list of all the engines that we know about.
+ const PrepopulatedEngine* const kAllEngines[] = {
+     // Prepopulated engines:
+-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &kvasir,
+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &duckduckgo, &kvasir,
+     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
+     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
+     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
@@ -0,0 +1,710 @@
+commit 8885c3f6f759c0d97183fe44913e2c4ca1839220
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 18 21:24:05 2017 +0200
+
+    Add StartPage search engine
+
+diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
+index 25e85ab..dcccdb8 100644
+--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
+@@ -32,7 +32,7 @@
+ 
+     // Increment this if you change the data in ways that mean users with
+     // existing data should get a new version.
+-    "kCurrentDataVersion": 100
+    "kCurrentDataVersion": 101
+   },
+ 
+   // The following engines are included in country lists and are added to the
+@@ -220,6 +220,16 @@
+       "id": 56
+     },
+ 
+    "startpage": {
+      "name": "StartPage",
+      "keyword": "startpage.com",
+      "favicon_url": "https://startpage.com/favicon.ico",
+      "search_url": "https://startpage.com/do/dsearch?query={searchTerms}",
+      "new_tab_url": "https://startpage.com/",
+      "type": "SEARCH_ENGINE_STARTPAGE",
+      "id": 12
+    },
+
+     "vinden": {
+       "name": "Vinden.nl",
+       "keyword": "vinden.nl",
+diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
+index 02f6b16..8df48741 100644
+--- a/components/search_engines/search_engine_type.h
+++ b/components/search_engines/search_engine_type.h
+@@ -64,6 +64,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_ZOZNAM,
+   SEARCH_ENGINE_360,
+   SEARCH_ENGINE_DUCKDUCKGO,
+  SEARCH_ENGINE_STARTPAGE,
+   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
+ };
+ 
+diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
+index 7adede7..52743e7 100644
+--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
+@@ -50,548 +50,548 @@ namespace {
+ 
+ // Default (for countries with no better engine set)
+ const PrepopulatedEngine* const engines_default[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // United Arab Emirates
+ const PrepopulatedEngine* const engines_AE[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Albania
+ const PrepopulatedEngine* const engines_AL[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Argentina
+ const PrepopulatedEngine* const engines_AR[] = {
+-    &google, &duckduckgo, &bing, &yahoo_ar,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
+ };
+ 
+ // Austria
+ const PrepopulatedEngine* const engines_AT[] = {
+-    &google, &duckduckgo, &bing, &yahoo_at,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_at,
+ };
+ 
+ // Australia
+ const PrepopulatedEngine* const engines_AU[] = {
+-    &google, &duckduckgo, &bing, &yahoo_au,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_au,
+ };
+ 
+ // Bosnia and Herzegovina
+ const PrepopulatedEngine* const engines_BA[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Belgium
+ const PrepopulatedEngine* const engines_BE[] = {
+-    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
+    &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
+ };
+ 
+ // Bulgaria
+ const PrepopulatedEngine* const engines_BG[] = {
+-    &google, &duckduckgo, &bing, &ask,
+    &google, &startpage, &duckduckgo, &bing, &ask,
+ };
+ 
+ // Bahrain
+ const PrepopulatedEngine* const engines_BH[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Burundi
+ const PrepopulatedEngine* const engines_BI[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Brunei
+ const PrepopulatedEngine* const engines_BN[] = {
+-    &google, &duckduckgo, &yahoo_my, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
+ };
+ 
+ // Bolivia
+ const PrepopulatedEngine* const engines_BO[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Brazil
+ const PrepopulatedEngine* const engines_BR[] = {
+-    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
+    &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
+ };
+ 
+ // Belarus
+ const PrepopulatedEngine* const engines_BY[] = {
+-    &google, &duckduckgo, &yandex_by, &mail_ru,
+    &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
+ };
+ 
+ // Belize
+ const PrepopulatedEngine* const engines_BZ[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Canada
+ const PrepopulatedEngine* const engines_CA[] = {
+-    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
+    &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
+ };
+ 
+ // Switzerland
+ const PrepopulatedEngine* const engines_CH[] = {
+-    &google, &duckduckgo, &bing, &yahoo_ch,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
+ };
+ 
+ // Chile
+ const PrepopulatedEngine* const engines_CL[] = {
+-    &google, &duckduckgo, &bing, &yahoo_cl,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
+ };
+ 
+ // China
+ const PrepopulatedEngine* const engines_CN[] = {
+-    &google, &duckduckgo, &baidu, &sogou, &so_360,
+    &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
+ };
+ 
+ // Colombia
+ const PrepopulatedEngine* const engines_CO[] = {
+-    &google, &duckduckgo, &bing, &yahoo_co,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_co,
+ };
+ 
+ // Costa Rica
+ const PrepopulatedEngine* const engines_CR[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Czech Republic
+ const PrepopulatedEngine* const engines_CZ[] = {
+-    &google, &duckduckgo, &seznam, &bing,
+    &google, &startpage, &duckduckgo, &seznam, &bing,
+ };
+ 
+ // Germany
+ const PrepopulatedEngine* const engines_DE[] = {
+-    &google, &duckduckgo, &bing, &yahoo_de,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
+ };
+ 
+ // Denmark
+ const PrepopulatedEngine* const engines_DK[] = {
+-    &google, &duckduckgo, &bing, &yahoo_dk,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
+ };
+ 
+ // Dominican Republic
+ const PrepopulatedEngine* const engines_DO[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Algeria
+ const PrepopulatedEngine* const engines_DZ[] = {
+-    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Ecuador
+ const PrepopulatedEngine* const engines_EC[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Estonia
+ const PrepopulatedEngine* const engines_EE[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Egypt
+ const PrepopulatedEngine* const engines_EG[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Spain
+ const PrepopulatedEngine* const engines_ES[] = {
+-    &google, &duckduckgo, &bing, &yahoo_es,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_es,
+ };
+ 
+ // Faroe Islands
+ const PrepopulatedEngine* const engines_FO[] = {
+-    &google, &duckduckgo, &bing, &ask,
+    &google, &startpage, &duckduckgo, &bing, &ask,
+ };
+ 
+ // Finland
+ const PrepopulatedEngine* const engines_FI[] = {
+-    &google, &duckduckgo, &bing, &yahoo_fi,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
+ };
+ 
+ // France
+ const PrepopulatedEngine* const engines_FR[] = {
+-    &google, &duckduckgo, &bing, &yahoo_fr,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
+ };
+ 
+ // United Kingdom
+ const PrepopulatedEngine* const engines_GB[] = {
+-    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
+ };
+ 
+ // Greece
+ const PrepopulatedEngine* const engines_GR[] = {
+-    &google, &duckduckgo, &bing, &yahoo_gr,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
+ };
+ 
+ // Guatemala
+ const PrepopulatedEngine* const engines_GT[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Hong Kong
+ const PrepopulatedEngine* const engines_HK[] = {
+-    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
+ };
+ 
+ // Honduras
+ const PrepopulatedEngine* const engines_HN[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Croatia
+ const PrepopulatedEngine* const engines_HR[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Hungary
+ const PrepopulatedEngine* const engines_HU[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Indonesia
+ const PrepopulatedEngine* const engines_ID[] = {
+-    &google, &duckduckgo, &yahoo_id, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_id, &bing,
+ };
+ 
+ // Ireland
+ const PrepopulatedEngine* const engines_IE[] = {
+-    &google, &duckduckgo, &bing, &yahoo_uk,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
+ };
+ 
+ // Israel
+ const PrepopulatedEngine* const engines_IL[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // India
+ const PrepopulatedEngine* const engines_IN[] = {
+-    &google, &duckduckgo, &bing, &yahoo_in,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_in,
+ };
+ 
+ // Iraq
+ const PrepopulatedEngine* const engines_IQ[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Iran
+ const PrepopulatedEngine* const engines_IR[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Iceland
+ const PrepopulatedEngine* const engines_IS[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Italy
+ const PrepopulatedEngine* const engines_IT[] = {
+-    &google, &duckduckgo, &virgilio, &bing,
+    &google, &startpage, &duckduckgo, &virgilio, &bing,
+ };
+ 
+ // Jamaica
+ const PrepopulatedEngine* const engines_JM[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Jordan
+ const PrepopulatedEngine* const engines_JO[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Japan
+ const PrepopulatedEngine* const engines_JP[] = {
+-    &google, &duckduckgo, &yahoo_jp, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
+ };
+ 
+ // Kenya
+ const PrepopulatedEngine* const engines_KE[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Kuwait
+ const PrepopulatedEngine* const engines_KW[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // South Korea
+ const PrepopulatedEngine* const engines_KR[] = {
+-    &google, &duckduckgo, &naver, &daum,
+    &google, &startpage, &duckduckgo, &naver, &daum,
+ };
+ 
+ // Kazakhstan
+ const PrepopulatedEngine* const engines_KZ[] = {
+-    &google, &duckduckgo, &mail_ru, &yandex_kz,
+    &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
+ };
+ 
+ // Lebanon
+ const PrepopulatedEngine* const engines_LB[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Liechtenstein
+ const PrepopulatedEngine* const engines_LI[] = {
+-    &google, &duckduckgo, &bing, &yahoo_de,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
+ };
+ 
+ // Lithuania
+ const PrepopulatedEngine* const engines_LT[] = {
+-    &google, &duckduckgo, &bing, &yandex_ru,
+    &google, &startpage, &duckduckgo, &bing, &yandex_ru,
+ };
+ 
+ // Luxembourg
+ const PrepopulatedEngine* const engines_LU[] = {
+-    &google, &duckduckgo, &bing, &yahoo_fr,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
+ };
+ 
+ // Latvia
+ const PrepopulatedEngine* const engines_LV[] = {
+-    &google, &duckduckgo, &yandex_ru, &bing,
+    &google, &startpage, &duckduckgo, &yandex_ru, &bing,
+ };
+ 
+ // Libya
+ const PrepopulatedEngine* const engines_LY[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Morocco
+ const PrepopulatedEngine* const engines_MA[] = {
+-    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Monaco
+ const PrepopulatedEngine* const engines_MC[] = {
+-    &google, &duckduckgo, &yahoo_fr, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
+ };
+ 
+ // Moldova
+ const PrepopulatedEngine* const engines_MD[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Montenegro
+ const PrepopulatedEngine* const engines_ME[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Macedonia
+ const PrepopulatedEngine* const engines_MK[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Mexico
+ const PrepopulatedEngine* const engines_MX[] = {
+-    &google, &duckduckgo, &bing, &yahoo_mx,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
+ };
+ 
+ // Malaysia
+ const PrepopulatedEngine* const engines_MY[] = {
+-    &google, &duckduckgo, &yahoo_my, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
+ };
+ 
+ // Nicaragua
+ const PrepopulatedEngine* const engines_NI[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Netherlands
+ const PrepopulatedEngine* const engines_NL[] = {
+-    &google, &duckduckgo, &yahoo_nl, &vinden,
+    &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
+ };
+ 
+ // Norway
+ const PrepopulatedEngine* const engines_NO[] = {
+-    &google, &duckduckgo, &bing, &kvasir,
+    &google, &startpage, &duckduckgo, &bing, &kvasir,
+ };
+ 
+ // New Zealand
+ const PrepopulatedEngine* const engines_NZ[] = {
+-    &google, &duckduckgo, &bing, &yahoo_nz,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
+ };
+ 
+ // Oman
+ const PrepopulatedEngine* const engines_OM[] = {
+-    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Panama
+ const PrepopulatedEngine* const engines_PA[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Peru
+ const PrepopulatedEngine* const engines_PE[] = {
+-    &google, &duckduckgo, &bing, &yahoo_pe,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
+ };
+ 
+ // Philippines
+ const PrepopulatedEngine* const engines_PH[] = {
+-    &google, &duckduckgo, &yahoo_ph, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
+ };
+ 
+ // Pakistan
+ const PrepopulatedEngine* const engines_PK[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Puerto Rico
+ const PrepopulatedEngine* const engines_PR[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Poland
+ const PrepopulatedEngine* const engines_PL[] = {
+-    &google, &duckduckgo, &onet, &bing,
+    &google, &startpage, &duckduckgo, &onet, &bing,
+ };
+ 
+ // Portugal
+ const PrepopulatedEngine* const engines_PT[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Paraguay
+ const PrepopulatedEngine* const engines_PY[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Qatar
+ const PrepopulatedEngine* const engines_QA[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Romania
+ const PrepopulatedEngine* const engines_RO[] = {
+-    &google, &duckduckgo, &yahoo_ro, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
+ };
+ 
+ // Serbia
+ const PrepopulatedEngine* const engines_RS[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Russia
+ const PrepopulatedEngine* const engines_RU[] = {
+-    &google, &duckduckgo, &yandex_ru, &mail_ru,
+    &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
+ };
+ 
+ // Rwanda
+ const PrepopulatedEngine* const engines_RW[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Saudi Arabia
+ const PrepopulatedEngine* const engines_SA[] = {
+-    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
+ };
+ 
+ // Sweden
+ const PrepopulatedEngine* const engines_SE[] = {
+-    &google, &duckduckgo, &bing, &yahoo_se,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_se,
+ };
+ 
+ // Singapore
+ const PrepopulatedEngine* const engines_SG[] = {
+-    &google, &duckduckgo, &yahoo_sg, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
+ };
+ 
+ // Slovenia
+ const PrepopulatedEngine* const engines_SI[] = {
+-    &google, &duckduckgo, &najdi, &ask,
+    &google, &startpage, &duckduckgo, &najdi, &ask,
+ };
+ 
+ // Slovakia
+ const PrepopulatedEngine* const engines_SK[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // El Salvador
+ const PrepopulatedEngine* const engines_SV[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Syria
+ const PrepopulatedEngine* const engines_SY[] = {
+-    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Thailand
+ const PrepopulatedEngine* const engines_TH[] = {
+-    &google, &duckduckgo, &yahoo_th, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_th, &bing,
+ };
+ 
+ // Tunisia
+ const PrepopulatedEngine* const engines_TN[] = {
+-    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // Turkey
+ const PrepopulatedEngine* const engines_TR[] = {
+-    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
+ };
+ 
+ // Trinidad and Tobago
+ const PrepopulatedEngine* const engines_TT[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Taiwan
+ const PrepopulatedEngine* const engines_TW[] = {
+-    &google, &duckduckgo, &yahoo_tw, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
+ };
+ 
+ // Tanzania
+ const PrepopulatedEngine* const engines_TZ[] = {
+-    &google, &duckduckgo, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &yahoo, &bing,
+ };
+ 
+ // Ukraine
+ const PrepopulatedEngine* const engines_UA[] = {
+-    &google, &duckduckgo, &yandex_ua, &bing,
+    &google, &startpage, &duckduckgo, &yandex_ua, &bing,
+ };
+ 
+ // United States
+ const PrepopulatedEngine* const engines_US[] = {
+-    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
+    &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
+ };
+ 
+ // Uruguay
+ const PrepopulatedEngine* const engines_UY[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Venezuela
+ const PrepopulatedEngine* const engines_VE[] = {
+-    &google, &duckduckgo, &bing, &yahoo_ve,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
+ };
+ 
+ // Vietnam
+ const PrepopulatedEngine* const engines_VN[] = {
+-    &google, &duckduckgo, &yahoo_vn, &bing,
+    &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
+ };
+ 
+ // Yemen
+ const PrepopulatedEngine* const engines_YE[] = {
+-    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
+ };
+ 
+ // South Africa
+ const PrepopulatedEngine* const engines_ZA[] = {
+-    &google, &duckduckgo, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &bing, &yahoo,
+ };
+ 
+ // Zimbabwe
+ const PrepopulatedEngine* const engines_ZW[] = {
+-    &google, &duckduckgo, &bing, &yahoo, &ask,
+    &google, &startpage, &duckduckgo, &bing, &yahoo, &ask,
+ };
+ 
+ // A list of all the engines that we know about.
+ const PrepopulatedEngine* const kAllEngines[] = {
+     // Prepopulated engines:
+-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &kvasir,
+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &kvasir,
+     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
+     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
+     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
@@ -0,0 +1,67 @@
+commit b944811d1324b0d16d4f40ff7420a3fe3c69fd52
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sat Oct 28 10:09:41 2017 +0200
+
+    Do not track google search results clicks, remove AMP
+
+diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
+index 93f080f..2df8d30 100644
+--- a/third_party/WebKit/Source/core/dom/BUILD.gn
+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
+@@ -344,6 +344,7 @@ blink_core_sources("dom") {
+     "events/TreeScopeEventContext.h",
+     "events/WindowEventContext.cpp",
+     "events/WindowEventContext.h",
+    "extensions/dont-track-me.h",
+     "trustedtypes/TrustedHTML.cpp",
+     "trustedtypes/TrustedHTML.h",
+     "trustedtypes/TrustedScriptURL.cpp",
+diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
+index b53451c..ecfa473 100644
+--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
+@@ -218,6 +218,7 @@
+ #include "core/xml/parser/XMLDocumentParser.h"
+ #include "core/xml_names.h"
+ #include "core/xmlns_names.h"
+#include "extensions/dont-track-me.h"
+ #include "platform/CrossThreadFunctional.h"
+ #include "platform/DateComponents.h"
+ #include "platform/EventDispatchForbiddenScope.h"
+@@ -5826,8 +5827,24 @@ void Document::FinishedParsing() {
+     fetcher_->ClearResourcesFromPreviousFetcher();
+   }
+ 
+-  if (IsPrefetchOnly())
+  if (IsPrefetchOnly()) {
+     WebPrerenderingSupport::Current()->PrefetchFinished();
+    return;
+  }
+
+  // determine whether this is a Google search results page
+  const SecurityOrigin *origin = GetSecurityOrigin();
+  if (origin) {
+    WTF::String domain = origin->Domain();
+    size_t pos = domain.Find(".google.");
+    auto* bodyElement = body();
+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+      LOG(INFO) << "Bromite: injecting dont-track-me Javascript payload";
+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
+      e->setText(DONT_TRACK_ME_JS);
+      bodyElement->AppendChild(e);
+    }
+  }
+ }
+ 
+ void Document::ElementDataCacheClearTimerFired(TimerBase*) {
+diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
+new file mode 100644
+--- /dev/null
+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
+@@ -0,0 +1,6 @@
+#ifndef dont_track_me_h
+#define dont_track_me_h
+
+#define DONT_TRACK_ME_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks());\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('mlogo');\n      if (mlogo) {\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks() {\n    var saned = 0, total = 0;\n    document.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n//    document.addEventListener('touchstart', handlePointerPress, true);\n    sanitizeAll();\n}\nsetMlogoClick();\n"
+
+#endif  // dont_track_me_h
@@ -1,12 +1,11 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:57:29 +0200
-Subject: Disable battery status service
+commit 8ca595ca27ab3d99674275c96b06b160a83d92e3
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 22:57:29 2017 +0200

---
- services/device/battery/battery_status_service.cc | 5 +++++
- 1 file changed, 5 insertions(+)
+    Disable battery status service

 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
+index 988f20d..adbaf69 100644
 --- a/services/device/battery/battery_status_service.cc
 +++ b/services/device/battery/battery_status_service.cc
@@ -41,6 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
@@ -28,6 +27,3 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
 
   return callback_list_.Add(callback);
 }
-- 
-2.7.4
-
@@ -1,28 +1,27 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 27 Oct 2017 15:53:37 +0200
-Subject: Disable data saver
+commit 6a6024067d27a53fb58af282580da68f6cea8809
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Fri Oct 27 15:53:37 2017 +0200

---
- .../java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java | 1 -
- .../chrome/browser/net/spdyproxy/DataReductionProxySettings.java        | 2 ++
- .../browser/preferences/datareduction/DataReductionPromoUtils.java      | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
+    Ported data reduction disable patch

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+index ccc8517..5c69672 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -140,7 +140,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -144,7 +144,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
         boolean notifyAdapter = false;
         // An optional Data Saver page.
         if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
-            mPages.add(new DataReductionProxyFirstRunFragment.Page());
+-            mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
+            //mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
             mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
             notifyAdapter = true;
         }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
+index 822f642..06e91a5 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -149,6 +149,7 @@ public class DataReductionProxySettings {
+@@ -156,6 +156,7 @@ public class DataReductionProxySettings {
         // DataReductionProxySettings is a singleton that lives forever and there's no clean
         // shutdown of Chrome on Android
         mNativeDataReductionProxySettings = nativeInit();
@@ -30,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D
     }
 
     /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -171,6 +172,7 @@ public class DataReductionProxySettings {
+@@ -178,6 +179,7 @@ public class DataReductionProxySettings {
      * data reduction statistics if this is the first time the SPDY proxy has been enabled.
      */
     public void setDataReductionProxyEnabled(Context context, boolean enabled) {
@@ -39,6 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D
                 && ContextUtils.getAppSharedPreferences().getLong(
                            DATA_REDUCTION_FIRST_ENABLED_TIME, 0)
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
+index bd42c89..b147765 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
@@ -68,7 +68,7 @@ public class DataReductionPromoUtils {
@@ -50,6 +50,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
     }
 
     /**
-- 
-2.7.4
-
@@ -0,0 +1,25 @@
+commit 31f49917379c516f5c71f4ca5aa140e2184c9f3b
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 23:24:58 2017 +0200
+
+    Disables omission of URL elements in Omnibox
+
+diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
+index bad3a45a..066407e 100644
+--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
+@@ -401,10 +401,10 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+ 
+ }  // namespace
+ 
+-const FormatUrlType kFormatUrlOmitNothing = 0;
+-const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
+-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
+-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
+const FormatUrlType kFormatUrlOmitNothing = 1;
+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
+ const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
+ const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
+ const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 1 << 5;
@@ -1,12 +1,11 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:58:52 +0200
-Subject: Disable GCM status check
+commit fd5c89a560c1fcbab8cd9b7335aca75a2d22d1e5
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 22:58:52 2017 +0200

---
- components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
- 1 file changed, 6 insertions(+)
+    Disable GCM status check

 diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
+index 8972447..415b1ab 100644
 --- a/components/gcm_driver/gcm_channel_status_request.cc
 +++ b/components/gcm_driver/gcm_channel_status_request.cc
@@ -23,8 +23,10 @@ namespace gcm {
@@ -38,6 +37,3 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc
 }
 
 void GCMChannelStatusRequest::OnURLFetchComplete(
-- 
-2.7.4
-
@@ -0,0 +1,13 @@
+diff --git a/tracing/third_party/gl-matrix/jsdoc-template/static/default.css b/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
+index efcf782..99a6767 100644
+--- a/third_party/catapult/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
+++ b/third_party/catapult/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
+@@ -168,7 +168,7 @@ ul.inheritsList
+ 
+ /* Copied from styles.css generated by Github Pages */
+ 
+-@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
+@import url(chrome://resources/css/roboto.css);
+ 
+ body {
+   padding:50px;
@@ -1,18 +1,14 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 15 Oct 2017 21:45:46 +0200
-Subject: Disable references to fonts.googleapis.com
+commit a06e62ec32a189b8cd16266e47b386ebe00cc04c
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 07:41:20 2017 +0200

---
- .../dom_distiller/content/browser/dom_distiller_viewer_source.cc       | 2 +-
- components/dom_distiller/core/html/preview.html                        | 2 +-
- components/dom_distiller/core/javascript/dom_distiller_viewer.js       | 2 +-
- third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css         | 3 +--
- 4 files changed, 4 insertions(+), 5 deletions(-)
+    Disables references to fonts.googleapis.com

 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+index bed7d31..cb8971f 100644
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -310,7 +310,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
     const {
@@ -22,6 +18,7 @@ diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_sourc
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
 diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
+index a4c07c5..894eb7f 100644
 --- a/components/dom_distiller/core/html/preview.html
 +++ b/components/dom_distiller/core/html/preview.html
@@ -11,7 +11,7 @@ found in the LICENSE file.
@@ -34,6 +31,7 @@ diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_di
     .english :lang(th) {display: none}
     .english :lang(zh) {display: none}
 diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+index 61ef521..2640e3a 100644
 --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
 +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -120,7 +120,7 @@ function maybeSetWebFont() {
@@ -46,6 +44,7 @@ diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/
   e.type = 'text/css';
   document.head.appendChild(e);
 diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
+index f21cfe9..b7a5d7a 100644
 --- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
 +++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
@@ -12,8 +12,7 @@
@@ -58,6 +57,3 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
 
 body,
 table,
-- 
-2.7.4
-
@@ -1,16 +1,15 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 08:15:17 +0200
-Subject: Disable NTP remote suggestions by default
+commit e1675be76a5ab56335b878dcef50043159efae7a
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 08:15:17 2017 +0200

---
- components/ntp_snippets/features.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+    Disable NTP remote suggestions by default

 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
+index 31823bbc..82eefe3 100644
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -41,16 +41,16 @@ const base::Feature kArticleSuggestionsExpandableHeader{
-     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -38,16 +38,16 @@ const base::Feature* const kAllFeatures[] = {
+     nullptr};
 
 const base::Feature kArticleSuggestionsFeature{
 -    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -29,6 +28,3 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 
 const base::Feature kPhysicalWebPageSuggestionsFeature{
     "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
-- 
-2.7.4
-
@@ -1,13 +1,11 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 01:35:53 +0200
-Subject: Disable updater pings
+commit 835aa728bc2eaa7f01dc875d87aa64b61bb11ccd
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 01:35:53 2017 +0200

---
- components/component_updater/configurator_impl.cc | 21 +++------------------
- components/component_updater/configurator_impl.h  |  1 -
- 2 files changed, 3 insertions(+), 19 deletions(-)
+    Disable updater pings

 diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
+index efc46c5..2bb49f36 100644
 --- a/components/component_updater/configurator_impl.cc
 +++ b/components/component_updater/configurator_impl.cc
@@ -56,8 +56,10 @@ const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
@@ -21,8 +19,8 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp
 
 // If there is an element of |vec| of the form |test|=.*, returns the right-
 // hand side of that assignment. Otherwise, returns an empty string.
-@@ -86,8 +88,7 @@ ConfiguratorImpl::ConfiguratorImpl(const base::CommandLine* cmdline,
-     : fast_update_(false),
+@@ -89,8 +91,7 @@ ConfiguratorImpl::ConfiguratorImpl(
+       fast_update_(false),
       pings_enabled_(false),
       deltas_enabled_(false),
 -      background_downloads_enabled_(false),
@@ -31,7 +29,7 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp
   // Parse comma-delimited debug flags.
   std::vector<std::string> switch_values = base::SplitString(
       cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
-@@ -135,22 +136,6 @@ int ConfiguratorImpl::UpdateDelay() const {
+@@ -138,22 +139,6 @@ int ConfiguratorImpl::UpdateDelay() const {
 
 std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
   std::vector<GURL> urls;
@@ -55,9 +53,10 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp
 }
 
 diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
+index afc3d2d..5258e47 100644
 --- a/components/component_updater/configurator_impl.h
 +++ b/components/component_updater/configurator_impl.h
-@@ -89,7 +89,6 @@ class ConfiguratorImpl {
+@@ -98,7 +98,6 @@ class ConfiguratorImpl {
   bool pings_enabled_;
   bool deltas_enabled_;
   bool background_downloads_enabled_;
@@ -65,6 +64,3 @@ diff --git a/components/component_updater/configurator_impl.h b/components/compo
 
   DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl);
 };
-- 
-2.7.4
-
@@ -1,15 +1,14 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 26 Oct 2017 16:59:03 +0200
-Subject: Disable WebRTC by default
+commit aff93733a4c414f9182103b7384c23e6fa450a6a
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 26 16:59:03 2017 +0200

---
- chrome/browser/ui/browser_ui_prefs.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+    Disable WebRTC by default

 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
+index 946f7cd..96b79b1 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -89,10 +89,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -81,10 +81,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
@@ -23,6 +22,3 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
 #endif
 
-- 
-2.7.4
-
@@ -1,30 +1,14 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 08:09:24 +0200
-Subject: Modify default preferences
+commit 3075d5cc23f69b42c80690162426ae2501cd2b5b
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 08:09:24 2017 +0200

---
- chrome/browser/background/background_mode_manager.cc              | 2 +-
- chrome/browser/chrome_content_browser_client.cc                   | 2 +-
- chrome/browser/io_thread.cc                                       | 2 +-
- chrome/browser/net/prediction_options.cc                          | 2 +-
- chrome/browser/net/prediction_options.h                           | 2 +-
- chrome/browser/profiles/profile.cc                                | 2 +-
- .../resources/settings/reset_page/reset_profile_dialog.html       | 2 +-
- chrome/browser/signin/signin_promo.cc                             | 4 ++--
- chrome/browser/ui/browser_ui_prefs.cc                             | 4 ++--
- chrome/browser/ui/navigation_correction_tab_observer.cc           | 2 +-
- chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc     | 4 ----
- chrome/service/cloud_print/connector_settings.cc                  | 2 +-
- components/autofill/core/browser/autofill_manager.cc              | 2 +-
- components/bookmarks/browser/bookmark_utils.cc                    | 4 ++--
- components/safe_browsing/common/safe_browsing_prefs.cc            | 4 ++--
- extensions/common/extension.cc                                    | 8 --------
- 16 files changed, 18 insertions(+), 30 deletions(-)
+    Modify default preferences

 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
+index 6b66f9e..ac44881 100644
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -34,30 +18,33 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+index a96f159e..7f7e9cf 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -990,7 +990,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -877,7 +877,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
 -  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
 +  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
   registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
-   // Register user prefs for mapping SitePerProcess and IsolateOrigins in
-   // user policy in addition to the same named ones in Local State (which are
+ }
+ 
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
+index e6ccce4..1e37c2b 100644
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                std::string());
   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
   data_reduction_proxy::RegisterPrefs(registry);
 -  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
-   registry->RegisterListPref(prefs::kDnsOverHttpsServers);
-   registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods);
   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
+   registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
+ #if defined(OS_POSIX)
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
+index 8ab8a07..967bf2f 100644
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
@@ -70,6 +57,7 @@ diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/predi
   }
 }
 diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h
+index 6512483..4c55a19 100644
 --- a/chrome/browser/net/prediction_options.h
 +++ b/chrome/browser/net/prediction_options.h
@@ -23,7 +23,7 @@ enum NetworkPredictionOptions {
@@ -82,9 +70,10 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
 
 enum class NetworkPredictionStatus {
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
+index 52042ee..b1acb4a 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -138,7 +138,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
+@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
@@ -94,6 +83,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
 #if defined(OS_ANDROID)
   registry->RegisterStringPref(
 diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+index b46a992..9d353d9 100644
 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
@@ -45,7 +45,7 @@
@@ -104,11 +94,12 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
 +        <paper-checkbox id="sendSettings">
           $i18nRaw{resetPageFeedback}</paper-checkbox>
       </div>
-     </cr-dialog>
+     </dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
+index 0f4bdb3..77e4810 100644
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -384,8 +384,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -371,8 +371,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -117,12 +108,13 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
 +  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
 +  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
-   registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0);
 }
+ 
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
+index bcd4d0e..2302f0f 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -137,6 +129,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
+index 887d681..60eea93 100644
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
@@ -149,6 +142,7 @@ diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/br
 }
 
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+index 8d043bd..69aa9f4 100644
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
@@ -163,6 +157,7 @@ diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chr
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
+index 83a4617..4b8511c 100644
 --- a/chrome/service/cloud_print/connector_settings.cc
 +++ b/chrome/service/cloud_print/connector_settings.cc
@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
@@ -175,9 +170,10 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
   xmpp_ping_enabled_ = prefs->GetBoolean(
       prefs::kCloudPrintXmppPingEnabled, false);
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
+index 9468cf2..86366ca 100644
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -211,7 +211,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
@@ -187,6 +183,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
   registry->RegisterBooleanPref(
       prefs::kAutofillProfileUseDatesFixed, false,
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
+index 8455e49..c7e70c0 100644
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
@@ -205,9 +202,10 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
   registry->RegisterBooleanPref(
       prefs::kShowManagedBookmarksInBookmarkBar,
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
+index a05123f..4b8b05cb 100644
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -343,9 +343,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -220,9 +218,10 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
   registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled,
                                 false);
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
+index b8da726..b9ca9b0 100644
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
   if (is_theme())
     return false;
 
@@ -237,6 +236,3 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
   // Unless they are unpacked, never show hosted apps. Note: We intentionally
   // show packaged apps and platform apps because there are some pieces of
   // functionality that are only available in chrome://extensions/ but which
-- 
-2.7.4
-
@@ -1,16 +1,15 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:50:10 +0200
-Subject: Disable third-party cookies by default
+commit 0a3880671af60180c72cdaf18e24f699db87ae23
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 22:50:10 2017 +0200

-author: Chad Miller <chad.miller@canonical.com>
---
- components/content_settings/core/browser/cookie_settings.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+    Disable third-party cookies by default
+    author: Chad Miller <chad.miller@canonical.com>

 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
+index 6dbac81..26a9c23 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
+@@ -80,7 +80,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -19,6 +18,3 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
-- 
-2.7.4
-
@@ -0,0 +1,21 @@
+commit 0e91bb1894cc0b7a9f2ddb8d3a8dd0cdc609910a
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 22:47:49 2017 +0200
+
+    Disable the ad promo system by default
+    author: Michael Gilbert <mgilbert@debian.org>
+    bug-debian: http://bugs.debian.org/634101
+
+diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
+index ce4b76e..23bedeb 100644
+--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
+@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
+ 
+   // Identifies whether we should show the app launcher promo or not. This
+   // becomes false when the user dismisses the promo.
+-  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
+  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
+ }
+ 
+ // static
@@ -1,15 +1,14 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 23:17:17 +0200
-Subject: Do not store passwords by default
+commit 5927635bd17374da897e3d49264c536c68a09868
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 23:17:17 2017 +0200

---
- components/password_manager/core/browser/password_manager.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+    Do not store passwords by default

 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
+index bbb0c20..cf171c0 100644
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -244,10 +244,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -207,10 +207,10 @@ PasswordFormManager* FindMatchedManager(
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -20,8 +19,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
+   registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
-                                PrefRegistry::NO_REGISTRATION_FLAGS);
-- 
-2.7.4
-
@@ -1,18 +1,18 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 13 Sep 2014 17:25:47 +0200
-Subject: prefs: only keep cookies until exit
+commit 099b041051cd3ea166c38269aa584bee7962d816
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 23:19:25 2017 +0200

-Out with all those tracking cookies!
-
-author: Jan Engelhardt <jengelh@inai.de>
---
- components/content_settings/core/browser/content_settings_registry.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+    Subject: [PATCH 21/60] prefs: only keep cookies until exit
+    From: Jan Engelhardt <jengelh@inai.de>
+    Date: Sat, 13 Sep 2014 17:25:47 +0200
+    
+    Out with all those tracking cookies!

 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+index fe84151..f303447 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() {
+@@ -118,7 +118,7 @@ void ContentSettingsRegistry::Init() {
   // WARNING: The string names of the permissions passed in below are used to
   // generate preference names and should never be changed!
 
@@ -21,6 +21,3 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
            WebsiteSettingsInfo::SYNCABLE,
            WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
-- 
-2.7.4
-
@@ -0,0 +1,34 @@
+commit 232645939b9739109cfadd92755375dd775b4768
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 23:22:05 2017 +0200
+
+    [PATCH 45/60] promo: disable Google promotion fetching
+    From: Jan Engelhardt <jengelh@inai.de>
+    Date: Sun, 9 Nov 2014 01:54:27 +0100
+    
+    Documentation is scarce, and sprinkled with misleading acronyms.
+    NTP is not NTP, for example. FWIW:
+    
+    // A PromoResourceService fetches data from a web resource server to
+    // be used to dynamically change the appearance of the New Tab Page.
+    // For example, it has been used to fetch "tips" to be displayed on
+    // the NTP, or to display promotional messages to certain groups of
+    // Chrome users.
+    
+    Whatever it is that it downloads, deactivate the one that leads to
+    Google.
+    
+    References: https://github.com/iridium-browser/iridium-browser/issues/33
+
+diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
+index 4dd2f65..01f0f66 100644
+--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
+@@ -84,6 +84,7 @@ namespace signin {
+ 
+ bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
+   DCHECK(profile);
+  return false;
+ 
+   // Don't show if the profile is an incognito.
+   if (profile->IsOffTheRecord())
@@ -0,0 +1,20 @@
+commit a53d9cf12fb835938c2d2ad641633126a07bf636
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sun Nov 26 11:40:05 2017 +0100
+
+    Restore classic new tab page
+
+diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
+index b756cb0..5785c581 100644
+--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
+@@ -171,9 +171,6 @@ struct NewTabURLDetails {
+ 
+     NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
+     switch (state) {
+-      case NEW_TAB_URL_VALID:
+-        // We can use the search provider's page.
+-        return NewTabURLDetails(search_provider_url, state);
+       case NEW_TAB_URL_INCOGNITO:
+         // Incognito has its own New Tab.
+         return NewTabURLDetails(GURL(), state);
@@ -1,18 +1,18 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 2 Apr 2015 12:44:23 +0200
-Subject: Remove EV certificates
+commit 6eaea225c3e5ceaba5a2753248c770b218bdc4f4
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 11 23:12:18 2017 +0200

-The team chose to let EV certificates appear just like normal
-certificates. The web of trust is considered a failure in itself, so
-do not give users a false sense of extra security with EV certs.
-Instead, let them appear just like regular ones.
-
-author: Jan Engelhardt <jengelh@inai.de>
---
- net/cert/ev_root_ca_metadata.cc | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
+    [PATCH 35/60] Remove EV certificates
+    From: Jan Engelhardt <jengelh@inai.de>
+    Date: Thu, 2 Apr 2015 12:44:23 +0200
+    
+    The team chose to let EV certificates appear just like normal
+    certificates. The web of trust is considered a failure in itself, so
+    do not give users a false sense of extra security with EV certs.
+    Instead, let them appear just like regular ones.

 diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
+index 3e89bb3..9bb411b 100644
 --- a/net/cert/ev_root_ca_metadata.cc
 +++ b/net/cert/ev_root_ca_metadata.cc
@@ -46,6 +46,16 @@ struct EVMetadata {
@@ -32,7 +32,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
     // AC Camerfirma S.A. Chambers of Commerce Root - 2008
     // https://www.camerfirma.com
     {
-@@ -748,7 +758,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
+@@ -708,7 +718,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
           0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
           0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
         {"2.16.840.1.114404.1.1.2.4.1", ""},
@@ -41,8 +41,5 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 +#endif
 +};
 
- #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+ #endif  // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN)
 
-- 
-2.7.4
-
@@ -1,267 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 2 May 2018 01:24:39 +0200
-Subject: Add Always Incognito option
-
---
- chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 ++++++++
- chrome/android/java/res/menu/main_menu.xml         | 12 ++++++++
- .../chromium/chrome/browser/ChromeActivity.java    |  4 +++
- .../chrome/browser/ChromeTabbedActivity.java       |  4 +++
- .../org/chromium/chrome/browser/IntentHandler.java |  8 ++---
- .../chrome/browser/LaunchIntentDispatcher.java     |  7 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 35 ++++++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java        |  2 ++
- .../browser/preferences/PrefServiceBridge.java     | 17 +++++++++++
- .../java/strings/android_chrome_strings.grd        | 10 +++++++
- 10 files changed, 106 insertions(+), 5 deletions(-)
-
-diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
-+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -62,6 +62,18 @@
-           </menu>
-         </item>
- 
-+        <item android:id="@+id/enable_always_incognito_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
-+          <menu>
-+              <item android:id="@+id/enable_always_incognito_id"
-+                  android:title="@string/menu_enable_always_incognito" />
-+              <item android:id="@+id/enable_always_incognito_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null"
-             android:orderInCategory="2">
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- a/chrome/android/java/res/menu/main_menu.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -72,6 +72,18 @@
-           </menu>
-         </item>
- 
-+        <item android:id="@+id/enable_always_incognito_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
-+          <menu>
-+              <item android:id="@+id/enable_always_incognito_id"
-+                  android:title="@string/menu_enable_always_incognito" />
-+              <item android:id="@+id/enable_always_incognito_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null">
-           <menu>
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -1905,6 +1905,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             RecordUserAction.record("MobileMenuSettings");
-         } else if (id == R.id.show_menu) {
-             showAppMenuForKeyboardEvent();
-+        } else if (id == R.id.enable_always_incognito_id || id == R.id.enable_always_incognito_check_id) {
-+            final boolean alwaysIncognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
-+            PrefServiceBridge.getInstance().setAlwaysIncognitoEnabled(!alwaysIncognito);
-+            RecordUserAction.record("MobileMenuRequestEnableAlwaysIncognito");
-         } else if (id == R.id.find_in_page_id) {
-             if (mFindToolbarManager == null) return false;
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1753,6 +1753,10 @@ public class ChromeTabbedActivity
-                 reportNewTabShortcutUsed(true);
-                 getTabCreator(true).launchNTP();
-             }
-+        } else if (id == R.id.enable_always_incognito_id || id == R.id.enable_always_incognito_check_id) {
-+            final boolean alwaysIncognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
-+            PrefServiceBridge.getInstance().setAlwaysIncognitoEnabled(!alwaysIncognito);
-+            RecordUserAction.record("MobileMenuRequestEnableAlwaysIncognito");
-         } else if (id == R.id.all_bookmarks_menu_id) {
-             if (currentTab != null) {
-                 getCompositorViewHolder().hideKeyboard(() -> {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
-@@ -732,7 +732,6 @@ public class IntentHandler {
-             // Determine if this intent came from a trustworthy source (either Chrome or Google
-             // first party applications).
-             boolean isInternal = isIntentChromeOrFirstParty(intent);
-            boolean isFromChrome = wasIntentSenderChrome(intent);
- 
-             // "Open new incognito tab" is currently limited to Chrome.
-             //
-@@ -741,11 +740,10 @@ public class IntentHandler {
-             // from the list.  In this case, we do not apply our Chrome token as the user has the
-             // option to select apps outside of our control, so we rely on this in memory check
-             // instead.
-            if (!isFromChrome
-                    && IntentUtils.safeGetBooleanExtra(
-+            if (IntentUtils.safeGetBooleanExtra(
-                             intent, EXTRA_OPEN_NEW_INCOGNITO_TAB, false)
-                    && (getPendingIncognitoUrl() == null
-                            || !getPendingIncognitoUrl().equals(intent.getDataString()))) {
-+                    && getPendingIncognitoUrl() != null
-+                            && getPendingIncognitoUrl().equals(intent.getDataString())) {
-                 return true;
-             }
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
- import org.chromium.chrome.browser.metrics.MediaNotificationUma;
- import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
- import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
-+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
- import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
- import org.chromium.chrome.browser.searchwidget.SearchActivity;
- import org.chromium.chrome.browser.tab.Tab;
-@@ -185,6 +186,12 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
-         boolean incognito =
-                 mIntent.getBooleanExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false);
- 
-+        if (!incognito) {
-+                incognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
-+                if (incognito) {
-+                       mIntent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
-+                }
-+        }
-         // Check if a web search Intent is being handled.
-         IntentHandler intentHandler = new IntentHandler(this, mActivity.getPackageName());
-         String url = IntentHandler.getUrlFromIntent(mIntent);
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -211,6 +211,8 @@ public class AppMenuPropertiesDelegate {
-                     && !TextUtils.isEmpty(url);
-             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
- 
-+            updateEnableAlwaysIncognitoMenuItem(menu, currentTab);
-+
-             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
- 
-             updateEnableJavascriptMenuItem(menu, currentTab);
-@@ -410,6 +412,39 @@ public class AppMenuPropertiesDelegate {
-     }
- 
-     /**
-+     * Updates the enable Always Incognito item's state.
-+     *
-+     * @param menu {@link Menu} for enable always incognito
-+     * @param currentTab      Current tab being displayed.
-+     */
-+    protected void updateEnableAlwaysIncognitoMenuItem(
-+            Menu menu, Tab currentTab) {
-+        MenuItem enableMenuRow = menu.findItem(R.id.enable_always_incognito_row_menu_id);
-+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_always_incognito_id);
-+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_always_incognito_check_id);
-+
-+        // Hide enable always incognito on all chrome:// pages and the NTP.
-+        String url = currentTab.getUrl();
-+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
-+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
-+
-+        boolean itemVisible = !isChromeScheme && !currentTab.isNativePage();
-+        enableMenuRow.setVisible(itemVisible);
-+        if (!itemVisible) return;
-+
-+        boolean alwaysIncognito = PrefServiceBridge.getInstance().alwaysIncognitoEnabled();
-+
-+        // Mark the checkbox if always incognito is activated on this tab.
-+        enableMenuCheck.setChecked(alwaysIncognito);
-+
-+        // This title doesn't seem to be displayed by Android, but it is used to set up
-+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
-+        enableMenuLabel.setTitleCondensed(alwaysIncognito
-+                        ? mActivity.getString(R.string.menu_enable_always_incognito_on)
-+                        : mActivity.getString(R.string.menu_enable_always_incognito_off));
-+    }
-+
-+    /**
-      * Updates the request desktop site item's state.
-      *
-      * @param menu {@link Menu} for request desktop site.
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -163,6 +163,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-                 }
-             }
- 
-+            updateEnableAlwaysIncognitoMenuItem(menu, currentTab);
-+
-             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
-             updateEnableJavascriptMenuItem(menu, currentTab);
-             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
-@@ -57,6 +57,8 @@ public class PrefServiceBridge {
-     private static final String CONTEXTUAL_SEARCH_DISABLED = "false";
-     private static final String CONTEXTUAL_SEARCH_ENABLED = "true";
- 
-+    private static boolean alwaysIncognito = false;
-+
-     /**
-      * Structure that holds all the version information about the current Chrome browser.
-      */
-@@ -359,6 +361,14 @@ public class PrefServiceBridge {
-     }
- 
-     /**
-+     * @return true if always-incognito is enabled.
-+     * The default is false.
-+     */
-+    public boolean alwaysIncognitoEnabled() {
-+        return alwaysIncognito;
-+    }
-+
-+    /**
-      * @return true if background sync is managed by policy.
-      */
-     public boolean isBackgroundSyncManaged() {
-@@ -422,6 +432,13 @@ public class PrefServiceBridge {
-     }
- 
-     /**
-+     * Enable or disable always-incognito mode.
-+     */
-+    public void setAlwaysIncognitoEnabled(boolean enabled) {
-+        alwaysIncognito = enabled;
-+    }
-+
-+    /**
-      * Enable or disable background sync.
-      */
-     public void setBackgroundSyncEnabled(boolean enabled) {
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2502,6 +2502,16 @@ To obtain new licenses, connect to the internet and play your downloaded content
-         Turn on JavaScript
-       </message>
- 
-+      <message name="IDS_MENU_ENABLE_ALWAYS_INCOGNITO" desc="Menu item in Chrome's overflow/options menu. If this menu item is selected, Bromite will always open new pages in incognito mode. [CHAR-LIMIT=27]">
-+        Always Incognito
-+      </message>
-+      <message name="IDS_MENU_ENABLE_ALWAYS_INCOGNITO_ON" desc="Accessibility description for when Always Incognito is selected.">
-+        Turn off Always Incognito
-+      </message>
-+      <message name="IDS_MENU_ENABLE_ALWAYS_INCOGNITO_OFF" desc="Accessibility description for when Enable Always Incognito is unselected.">
-+        Turn on Always Incognito
-+      </message>
-+
-       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Chrome's overflow/options menu. By default, when a user navigates to a web page, Chrome shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Chrome will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
-         Desktop site
-       </message>
-- 
-2.7.4
-
@@ -1,974 +0,0 @@
-commit 56ab68688e7d2c7734e6190bf602dd584eae3222
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Dec 9 23:03:50 2017 +0100
-
-    Incognito-only mode ported from CAF
-    Some rework was needed, almost nothing applied cleanly.
-    See below for the description of the two commits that were merged in this one.
-    
-        Browser setting to switch to incognito only mode
-    
-        - Added a setting to switch to incognito only mode in
-          privacy settings
-        - Upon enabling or disabling the switch, the browser will
-          restart in the respective mode (regular or incognito only)
-    
-        Change-Id: Ic42daa3e9bfdc0fcb4029d9df16ed57c5776d966
-    
-        Fix issues seen in full incognito mode
-    
-        - Fixes crashes seen in incognito mode.
-        - Allow Custom Tabs, Web Apps to use the incognito only mode.
-        - Ensure we notify the user of the incognito mode in the notification bar and remove the notification when all
-          incognito tabs are closed.
-        - Ensure the status bar for Custom Tabs and Web Apps are grey to give a visual notification to use.
-        - Ensure the tabs are correctly ref counted for Custom Tabs, Web Apps when using incognito only mode.
-    
-        CR-Fixed: SWE-8867, SWE-8802
-    
-        Change-Id: I95a77016e7562d82359c7780771da4c7bb73aa06
-
-diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
-index ce7db92..a85aea3 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
-+++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -31,6 +31,10 @@
-         android:title="@string/network_predictions_title"
-         android:summary="@string/network_predictions_summary"
-         android:persistent="false" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-+        android:key="incognito_only"
-+        android:title="@string/incognito_only_title"
-+        android:summary="@string/incognito_only_summary" />
-     <Preference
-         android:key="usage_and_crash_reports"
-         android:title="@string/usage_and_crash_reports_title"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-index 49a3251..7445c9b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -51,6 +51,9 @@ import org.chromium.base.VisibleForTesting;
- import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.chrome.R;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
-+import org.chromium.chrome.browser.init.AsyncInitializationActivity;
-+import org.chromium.chrome.browser.preferences.AboutChromePreferences;
- import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
- import org.chromium.chrome.browser.IntentHandler.TabOpenType;
- import org.chromium.chrome.browser.appmenu.AppMenu;
-@@ -84,6 +87,7 @@ import org.chromium.chrome.browser.gsa.GSAAccountChangeListener;
- import org.chromium.chrome.browser.gsa.GSAState;
- import org.chromium.chrome.browser.help.HelpAndFeedback;
- import org.chromium.chrome.browser.history.HistoryManagerUtils;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.infobar.InfoBarContainer;
- import org.chromium.chrome.browser.init.AsyncInitializationActivity;
- import org.chromium.chrome.browser.init.ProcessInitializationHandler;
-@@ -130,6 +134,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarManager;
- import org.chromium.chrome.browser.util.AccessibilityUtil;
- import org.chromium.chrome.browser.util.ColorUtils;
- import org.chromium.chrome.browser.util.FeatureUtilities;
-+
- import org.chromium.chrome.browser.vr_shell.VrIntentUtils;
- import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
- import org.chromium.chrome.browser.webapps.AddToHomescreenManager;
-@@ -1312,6 +1317,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-      * @param menu Menu that is going to be shown when the menu button is pressed.
-      */
-     public void prepareMenu(Menu menu) {
-+        if (IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()) {
-+            menu.findItem(R.id.new_incognito_tab_menu_id).setVisible(false);
-+        }
-     }
- 
-     protected IntentHandlerDelegate createIntentHandlerDelegate() {
-@@ -1436,7 +1444,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             throw new IllegalStateException(
-                     "Attempting to access TabCreator before initialization");
-         }
-        return incognito ? mIncognitoTabCreator : mRegularTabCreator;
-+        return incognito || IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()
-+                ? mIncognitoTabCreator : mRegularTabCreator;
-     }
- 
-     /**
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java
-index 44c9c8a..bcba76a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/SingleTabActivity.java
-@@ -4,15 +4,28 @@
- 
- package org.chromium.chrome.browser;
- 
-+import android.annotation.SuppressLint;
- import android.content.Intent;
- import android.util.Pair;
- 
-+import org.chromium.base.ThreadUtils;
-+import org.chromium.chrome.R;
-+import org.chromium.chrome.browser.ChromeActivity;
-+import org.chromium.chrome.browser.TabState;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
-+import org.chromium.chrome.browser.metrics.PageLoadMetrics;
-+import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabDelegateFactory;
- import org.chromium.chrome.browser.tab.TabUma.TabCreationState;
-+import org.chromium.chrome.browser.tabmodel.EmptyTabModel;
-+import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
- import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector;
- import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
-+import org.chromium.chrome.browser.tabmodel.TabModelObserver;
- import org.chromium.chrome.browser.tabmodel.TabModelSelector;
- import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
- import org.chromium.content_public.browser.ChildProcessImportance;
-@@ -38,7 +51,8 @@ public abstract class SingleTabActivity extends ChromeActivity {
- 
-     @Override
-     protected TabModelSelector createTabModelSelector() {
-        return new SingleTabModelSelector(this, false, false) {
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        return new SingleTabModelSelector(this, incognitoOnly, false) {
-             @Override
-             public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, Tab parent,
-                     boolean incognito) {
-@@ -81,6 +95,7 @@ public abstract class SingleTabActivity extends ChromeActivity {
-      */
-     protected Tab createTab() {
-         Tab tab = null;
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-         boolean unfreeze = false;
- 
-         int tabId = Tab.INVALID_TAB_ID;
-@@ -93,13 +108,14 @@ public abstract class SingleTabActivity extends ChromeActivity {
-         if (tabId != Tab.INVALID_TAB_ID && tabUrl != null && getActivityDirectory() != null) {
-             // Restore the tab.
-             TabState tabState = TabState.restoreTabState(getActivityDirectory(), tabId);
-            tab = new Tab(tabId, Tab.INVALID_TAB_ID, false, getWindowAndroid(),
-                    TabLaunchType.FROM_RESTORE, TabCreationState.FROZEN_ON_RESTORE, tabState);
-+            tab = new Tab(tabId, Tab.INVALID_TAB_ID, incognitoOnly, this, getWindowAndroid(),
-+                    TabLaunchType.FROM_RESTORE,
-+                    TabCreationState.FROZEN_ON_RESTORE, tabState);
-             unfreeze = true;
-         }
- 
-         if (tab == null) {
-            tab = new Tab(Tab.INVALID_TAB_ID, Tab.INVALID_TAB_ID, false, getWindowAndroid(),
-+            tab = new Tab(Tab.INVALID_TAB_ID, Tab.INVALID_TAB_ID, incognitoOnly, this, getWindowAndroid(),
-                     TabLaunchType.FROM_CHROME_UI, null, null);
-         }
- 
-@@ -137,4 +153,31 @@ public abstract class SingleTabActivity extends ChromeActivity {
- 
-     @Override
-     public void onCheckForUpdate(boolean updateAvailable) {}
-+
-+    private void handleTabClose() {
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        if (incognitoOnly && isInitialized()) {
-+            destroyIncognitoIfNecessary();
-+        }
-+    }
-+
-+    protected void destroyIncognitoIfNecessary() {
-+        ThreadUtils.assertOnUiThread();
-+
-+        Profile profile = getTabModelSelector().getModel(true).getProfile();
-+        // destroy the current tabmodel that will destroy tabs internally
-+        getCurrentTabModel().destroy();
-+        // Only delete the incognito profile if there are no incognito tabs open in any tab
-+        // model selector as the profile is shared between them.
-+        if (profile != null && !(IncognitoNotificationService.getIncognitoTabCount() > 0)) {
-+            profile.destroyWhenAppropriate();
-+            IncognitoNotificationManager.dismissIncognitoNotification();
-+        }
-+
-+    }
-+
-+    @Override
-+    protected void onDestroyInternal() {
-+        handleTabClose();
-+    }
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-index afc92bed..39caa0b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.widget.ControlContainer;
- import org.chromium.content_public.browser.WebContents;
- import org.chromium.content_public.browser.WebContentsObserver;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- 
- import java.net.InetAddress;
- import java.net.MalformedURLException;
-@@ -289,8 +290,9 @@ public final class WarmupManager {
-     public void createSpareWebContents() {
-         ThreadUtils.assertOnUiThread();
-         if (!LibraryLoader.isInitialized()) return;
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-         if (mSpareWebContents != null || SysUtils.isLowEndDevice()) return;
-        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
-+        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(incognitoOnly, false);
-         mObserver = new RenderProcessGoneObserver();
-         mSpareWebContents.addObserver(mObserver);
-         mWebContentsCreationTimeMs = SystemClock.elapsedRealtime();
-@@ -316,7 +318,7 @@ public final class WarmupManager {
-      */
-     public WebContents takeSpareWebContents(boolean incognito, boolean initiallyHidden) {
-         ThreadUtils.assertOnUiThread();
-        if (incognito || initiallyHidden) return null;
-+        if ((incognito != mSpareWebContents.isIncognito()) || initiallyHidden) return null;
-         WebContents result = mSpareWebContents;
-         if (result == null) return null;
-         mSpareWebContents = null;
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-index e48a3e8..5435958 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.UrlConstants;
- import org.chromium.chrome.browser.banners.AppBannerManager;
- import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
- import org.chromium.chrome.browser.download.DownloadUtils;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
- import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
- import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
-@@ -175,6 +176,8 @@ public class AppMenuPropertiesDelegate {
- 
-             MenuItem allBookmarksMenuItem = menu.findItem(R.id.all_bookmarks_menu_id);
-             // Hide 'History' in incognito only browser
-+            boolean isIncognitoOnlyBrowser = IncognitoOnlyModeUtil.getInstance()
-+                    .isIncognitoOnlyBrowser();
-             menu.findItem(R.id.open_history_menu_id).setVisible(!isIncognitoOnlyBrowser);
- 
-             allBookmarksMenuItem.setTitle(mActivity.getString(R.string.menu_bookmarks));
-@@ -201,7 +204,7 @@ public class AppMenuPropertiesDelegate {
-             //                is not persisted when adding to the homescreen.
-             // * If creating shortcuts it not supported by the current home screen.
-             boolean canShowHomeScreenMenuItem = ShortcutHelper.isAddToHomeIntentSupported()
-                    && !isChromeScheme && !isFileScheme && !isContentScheme && !isIncognito
-+                    && !isChromeScheme && !isFileScheme && !isContentScheme && (!isIncognito || isIncognitoOnlyBrowser)
-                     && !TextUtils.isEmpty(url);
-             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
- 
-@@ -224,7 +227,8 @@ public class AppMenuPropertiesDelegate {
-         }
- 
-         if (isOverviewMenu) {
-            if (isIncognito) {
-+            if (isIncognito
-+                    && !(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled())) {
-                 // Hide normal close all tabs item.
-                 menu.findItem(R.id.close_all_tabs_menu_id).setVisible(false);
-                 // Enable close incognito tabs only if there are incognito tabs.
-@@ -244,6 +248,7 @@ public class AppMenuPropertiesDelegate {
-         }
- 
-         boolean incognitoMenuItemVisible = !isBottomSheetNtpMenu || !isIncognito;
-+        incognitoMenuItemVisible &= !(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled());
-         // Disable new incognito tab when it is blocked (e.g. by a policy).
-         // findItem(...).setEnabled(...)" is not enough here, because of the inflated
-         // main_menu.xml contains multiple items with the same id in different groups
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
-index 03edf2d..fb2cc2e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java
-@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
- import org.chromium.chrome.browser.compositor.scene_layer.TabListSceneLayer;
- import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
- import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tabmodel.TabModel;
- import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-@@ -328,8 +329,10 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
-     @Override
-     public void setTabModelSelector(TabModelSelector modelSelector, TabContentManager manager) {
-         super.setTabModelSelector(modelSelector, manager);
-        mStacks[0].setTabModel(modelSelector.getModel(false));
-        mStacks[1].setTabModel(modelSelector.getModel(true));
-+        mStacks[0].setTabModel(modelSelector
-+            .getModel(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()));
-+        mStacks[1].setTabModel(modelSelector
-+            .getModel(!IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()));
-         resetScrollData();
-     }
- 
-@@ -341,6 +344,9 @@ public class StackLayout extends Layout implements Animatable<StackLayout.Proper
-      * @VisibleForTesting
-      */
-     public Stack getTabStack(boolean incognito) {
-+        if (IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()) {
-+            return mStacks[incognito ? 0 : 1];
-+        }
-         return mStacks[incognito ? 1 : 0];
-     }
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
-index 8230bc2..687c8a4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
-@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
- import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirection;
- import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout;
- import org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimation.OverviewAnimationType;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tabmodel.TabModel;
- import org.chromium.chrome.browser.tabmodel.TabModelUtils;
-@@ -436,7 +437,9 @@ public class Stack {
-      * @return Whether or not the TabModel represented by this TabStackState should be displayed.
-      */
-     public boolean isDisplayable() {
-        return !mTabModel.isIncognito() || (!mIsDying && mTabModel.getCount() > 0);
-+        return (!mTabModel.isIncognito()
-+                && !IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled())
-+                || (!mIsDying && mTabModel.getCount() > 0);
-     }
- 
-     private float getDefaultDiscardDirection() {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-index 25f1fd7..6257c82 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.compositor.layouts.eventfilter.GestureHandler
- import org.chromium.chrome.browser.compositor.overlays.SceneOverlay;
- import org.chromium.chrome.browser.compositor.scene_layer.SceneOverlayLayer;
- import org.chromium.chrome.browser.compositor.scene_layer.TabStripSceneLayer;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
- import org.chromium.chrome.browser.tabmodel.TabModel;
-@@ -377,7 +378,8 @@ public class StripLayoutHelperManager implements SceneOverlay {
-         mModelSelectorButton.setIncognito(mIsIncognito);
-         if (mTabModelSelector != null) {
-             boolean isVisible = mTabModelSelector.getModel(true).getCount() != 0;
-            mModelSelectorButton.setVisible(isVisible);
-+            mModelSelectorButton.setVisible(isVisible
-+                    && !IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled());
- 
-             float endMargin = isVisible
-                     ? MODEL_SELECTOR_BUTTON_WIDTH_DP + MODEL_SELECTOR_BUTTON_END_PADDING_DP
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-index 43b556f..2b92e83 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -59,9 +59,13 @@ import org.chromium.chrome.browser.browserservices.BrowserSessionContentUtils;
- import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
- import org.chromium.chrome.browser.datausage.DataUseTabUIManager;
- import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
- import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
- import org.chromium.chrome.browser.gsa.GSAState;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.metrics.PageLoadMetrics;
- import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.page_info.PageInfoPopup;
-@@ -334,7 +338,12 @@ public class CustomTabActivity extends ChromeActivity {
-         if (mConnection.shouldHideDomainForSession(mSession)) {
-             getToolbarManager().setUrlBarHidden(true);
-         }
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-         int toolbarColor = mIntentDataProvider.getToolbarColor();
-+        if (incognitoOnly) {
-+            toolbarColor = ApiCompatibilityUtils.getColor(getResources(),
-+                    R.color.incognito_primary_color);
-+        }
-         getToolbarManager().updatePrimaryColor(toolbarColor, false);
-         if (!mIntentDataProvider.isOpenedByChrome()) {
-             getToolbarManager().setShouldUpdateToolbarPrimaryColor(false);
-@@ -390,7 +399,8 @@ public class CustomTabActivity extends ChromeActivity {
-             mConnection.cancelSpeculation(mSession);
-         }
- 
-        getTabModelSelector().getModel(false).addObserver(mTabModelObserver);
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        getTabModelSelector().getModel(incognitoOnly).addObserver(mTabModelObserver);
- 
-         boolean successfulStateRestore = false;
-         // Attempt to restore the previous tab state if applicable.
-@@ -412,7 +422,7 @@ public class CustomTabActivity extends ChromeActivity {
-             } else {
-                 mMainTab = createMainTab();
-             }
-            getTabModelSelector().getModel(false).addTab(mMainTab, 0, mMainTab.getLaunchType());
-+            getTabModelSelector().getModel(incognitoOnly).addTab(mMainTab, 0, mMainTab.getLaunchType());
-         }
- 
-         // This cannot be done before because we want to do the reparenting only
-@@ -550,7 +560,9 @@ public class CustomTabActivity extends ChromeActivity {
-                 getIntent(), IntentHandler.EXTRA_TAB_ID, Tab.INVALID_TAB_ID);
-         int parentTabId = IntentUtils.safeGetIntExtra(
-                 getIntent(), IntentHandler.EXTRA_PARENT_TAB_ID, Tab.INVALID_TAB_ID);
-        Tab tab = new Tab(assignedTabId, parentTabId, false, getWindowAndroid(),
-+
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        Tab tab = new Tab(assignedTabId, parentTabId, incognitoOnly, getWindowAndroid(),
-                 TabLaunchType.FROM_EXTERNAL_APP, null, null);
-         if (getIntent().getIntExtra(
-                     CustomTabIntentDataProvider.EXTRA_BROWSER_LAUNCH_SOURCE, ACTIVITY_TYPE_OTHER)
-@@ -588,12 +600,12 @@ public class CustomTabActivity extends ChromeActivity {
-                 webContentsStateOnLaunch = WEBCONTENTS_STATE_TRANSFERRED_WEBCONTENTS;
-                 webContents.resumeLoadingCreatedWebContents();
-             } else {
-                webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);
-+                webContents = WarmupManager.getInstance().takeSpareWebContents(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled(), false);
-                 if (webContents != null) {
-                     webContentsStateOnLaunch = WEBCONTENTS_STATE_SPARE_WEBCONTENTS;
-                 } else {
-                     webContents =
-                            WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
-+                            WebContentsFactory.createWebContentsWithWarmRenderer(IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled(), false);
-                     webContentsStateOnLaunch = WEBCONTENTS_STATE_NO_WEBCONTENTS;
-                 }
-             }
-@@ -835,6 +847,13 @@ public class CustomTabActivity extends ChromeActivity {
-         if (getAppMenuHandler() != null) getAppMenuHandler().hideAppMenu();
- 
-         super.finish();
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        if (incognitoOnly) {
-+            int incognitoCount = IncognitoNotificationService.getIncognitoTabCount();
-+            if (incognitoCount == 0) {
-+                IncognitoNotificationManager.dismissIncognitoNotification();
-+            }
-+        }
-         if (mIntentDataProvider != null && mIntentDataProvider.shouldAnimateOnFinish()) {
-             mShouldOverridePackage = true;
-             overridePendingTransition(mIntentDataProvider.getAnimationEnterRes(),
-@@ -853,7 +872,8 @@ public class CustomTabActivity extends ChromeActivity {
-     public final void finishAndClose(boolean reparenting) {
-         if (mIsClosing) return;
-         mIsClosing = true;
-        if (!reparenting) {
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        if (!reparenting && !incognitoOnly) {
-             // Closing the activity destroys the renderer as well. Re-create a spare renderer some
-             // time after, so that we have one ready for the next tab open. This does not increase
-             // memory consumption, as the current renderer goes away. We create a renderer as a lot
-@@ -1025,7 +1045,8 @@ public class CustomTabActivity extends ChromeActivity {
-     protected void setStatusBarColor(Tab tab, int color) {
-         // Intentionally do nothing as CustomTabActivity explicitly sets status bar color.  Except
-         // for Custom Tabs opened by Chrome.
-        if (mIntentDataProvider.isOpenedByChrome()) super.setStatusBarColor(tab, color);
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        if (mIntentDataProvider.isOpenedByChrome() && !incognitoOnly) super.setStatusBarColor(tab, color);
-     }
- 
-     /**
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
-index f9e91ad..3e9bd1c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java
-@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.incognito;
- 
- import android.annotation.TargetApi;
- import android.app.Activity;
-+import android.util.SparseArray;
- import android.app.ActivityManager;
- import android.app.ActivityManager.AppTask;
- import android.app.ActivityManager.RecentTaskInfo;
-@@ -24,15 +25,21 @@ import org.chromium.base.ContextUtils;
- import org.chromium.base.ThreadUtils;
- import org.chromium.base.VisibleForTesting;
- import org.chromium.base.library_loader.LibraryProcessType;
-+import org.chromium.chrome.browser.ChromeActivity;
-+import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.ChromeTabbedActivity;
- import org.chromium.chrome.browser.TabState;
-+import org.chromium.chrome.browser.customtabs.CustomTabActivity;
- import org.chromium.chrome.browser.document.ChromeLauncherActivity;
- import org.chromium.chrome.browser.document.DocumentUtils;
- import org.chromium.chrome.browser.profiles.Profile;
-+import org.chromium.chrome.browser.tabmodel.AsyncTabParams;
-+import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
- import org.chromium.chrome.browser.tabmodel.TabWindowManager;
- import org.chromium.chrome.browser.tabmodel.TabbedModeTabPersistencePolicy;
- import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
- import org.chromium.content.browser.BrowserStartupController;
-+import org.chromium.chrome.browser.webapps.WebappActivity;
- 
- import java.io.File;
- import java.lang.ref.WeakReference;
-@@ -189,7 +196,9 @@ public class IncognitoNotificationService extends IntentService {
-                 for (int i = 0; i < runningActivities.size(); i++) {
-                     Activity activity = runningActivities.get(i).get();
-                     if (activity == null) continue;
-                    if (!(activity instanceof ChromeTabbedActivity)) continue;
-+                    if (!(activity instanceof ChromeTabbedActivity ||
-+                            activity instanceof CustomTabActivity ||
-+                            activity instanceof WebappActivity)) continue;
- 
-                     ChromeTabbedActivity tabbedActivity = (ChromeTabbedActivity) activity;
-                     if (tabbedActivity.isActivityDestroyed()) continue;
-@@ -205,7 +214,7 @@ public class IncognitoNotificationService extends IntentService {
-                                 BottomSheet.SHEET_STATE_PEEK, false);
-                     }
- 
-                    tabbedActivity.getTabModelSelector().getModel(true).closeAllTabs(
-+                    chromeActivity.getTabModelSelector().getModel(true).closeAllTabs(
-                             false, false);
-                 }
-             }
-@@ -229,4 +238,30 @@ public class IncognitoNotificationService extends IntentService {
-         return deletionSuccessful;
-     }
- 
-+    public static int getIncognitoTabCount() {
-+        int count = 0;
-+        List<WeakReference<Activity>> runningActivities =
-+                ApplicationStatus.getRunningActivities();
-+        for (int i = 0; i < runningActivities.size(); i++) {
-+            Activity activity = runningActivities.get(i).get();
-+            if (activity == null) continue;
-+            if (!(activity instanceof ChromeTabbedActivity ||
-+                    activity instanceof CustomTabActivity ||
-+                    activity instanceof WebappActivity)) continue;
-+
-+            ChromeActivity chromeActivity = (ChromeActivity) activity;
-+            if (chromeActivity.isActivityDestroyed()) continue;
-+
-+            count += chromeActivity.getTabModelSelector().getModel(true).getCount();
-+        }
-+        // Count tabs that are moving between activities (e.g. a tab that was recently reparented
-+        // and hasn't been attached to its new activity yet).
-+        SparseArray<AsyncTabParams> asyncTabParams = AsyncTabParamsManager.getAsyncTabParams();
-+        for (int i = 0; i < asyncTabParams.size(); i++) {
-+            Tab tab = asyncTabParams.valueAt(i).getTabToReparent();
-+            if (tab != null && tab.isIncognito()) count++;
-+        }
-+        return count;
-+    }
-+
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java
-new file mode 100644
-index 0000000..f6b17e7
--- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *     * Redistributions of source code must retain the above copyright
-+ *       notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ *       copyright notice, this list of conditions and the following
-+ *       disclaimer in the documentation and/or other materials provided
-+ *       with the distribution.
-+ *     * Neither the name of The Linux Foundation nor the names of its
-+ *       contributors may be used to endorse or promote products derived
-+ *       from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+package org.chromium.chrome.browser.incognito;
-+
-+import org.chromium.base.CommandLine;
-+import org.chromium.base.ContextUtils;
-+import org.chromium.chrome.browser.ChromeSwitches;
-+import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
-+
-+/**
-+ * Utility class for incognito only mode
-+ */
-+public class IncognitoOnlyModeUtil {
-+    private static IncognitoOnlyModeUtil sInstance;
-+
-+    private IncognitoOnlyModeUtil() {}
-+
-+    public static IncognitoOnlyModeUtil getInstance() {
-+        if (sInstance == null) {
-+            sInstance = new IncognitoOnlyModeUtil();
-+        }
-+        return sInstance;
-+    }
-+    /**
-+     * @return whether incognito only browser
-+     */
-+    public boolean isIncognitoOnlyBrowser() {
-+        return CommandLine.getInstance().hasSwitch(ChromeSwitches.INCOGNITO_ONLY_MODE);
-+    }
-+
-+    /**
-+     * @return whether incognito only mode preference is enabled
-+     */
-+    public boolean isIncognitoOnlyPreferenceEnabled() {
-+        return PrivacyPreferencesManager.getInstance(ContextUtils.getApplicationContext()).
-+                isIncognitoOnlyEnabled();
-+    }
-+
-+    /**
-+     * @return whether incognito only browser or incognito only mode preference is enabled
-+     */
-+    public boolean isIncognitoOnlyModeEnabled() {
-+        return isIncognitoOnlyBrowser() || isIncognitoOnlyPreferenceEnabled();
-+    }
-+
-+}
-\ No newline at end of file
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
-index e594c57..def79eb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
-@@ -20,6 +20,7 @@ import android.widget.FrameLayout;
- import org.chromium.base.ApiCompatibilityUtils;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.WindowDelegate;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.ntp.NewTabPage;
- import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
- import org.chromium.chrome.browser.util.MathUtils;
-@@ -271,7 +272,8 @@ public class LocationBarPhone extends LocationBarLayout {
- 
-         boolean showIncognitoBadge =
-                 getToolbarDataProvider() != null && getToolbarDataProvider().isIncognito();
-        mIncognitoBadge.setVisibility(showIncognitoBadge ? VISIBLE : GONE);
-+        mIncognitoBadge.setVisibility(showIncognitoBadge
-+                && !IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled() ? VISIBLE : GONE);
-         updateIncognitoBadgePadding();
-     }
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-index 0d78e7c..b1b9f67 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -4,6 +4,8 @@
- 
- package org.chromium.chrome.browser.preferences.privacy;
- 
-+import android.app.AlertDialog;
-+import android.content.DialogInterface;
- import android.os.Bundle;
- import android.preference.CheckBoxPreference;
- import android.preference.Preference;
-@@ -18,8 +20,11 @@ import org.chromium.base.SysUtils;
- import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
-+import org.chromium.chrome.browser.ApplicationLifetime;
-+import org.chromium.chrome.browser.ChromeSwitches;
- import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
- import org.chromium.chrome.browser.help.HelpAndFeedback;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.physicalweb.PhysicalWeb;
- import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
- import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
-@@ -41,6 +46,7 @@ public class PrivacyPreferences extends PreferenceFragment
-     private static final String PREF_SAFE_BROWSING = "safe_browsing";
-     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
-     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
-+    private static final String PREF_INCOGNITO_ONLY = "incognito_only";
-     private static final String PREF_DO_NOT_TRACK = "do_not_track";
-     private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
-     private static final String PREF_PHYSICAL_WEB = "physical_web";
-@@ -129,6 +135,18 @@ public class PrivacyPreferences extends PreferenceFragment
-             recordNetworkPredictionEnablingUMA((boolean) newValue);
-         } else if (PREF_NAVIGATION_ERROR.equals(key)) {
-             PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
-+        } else if (PREF_INCOGNITO_ONLY.equals(key)) {
-+            incognitoOnlyPreferenceDialog(preference, (boolean) newValue).show();
-+        }
-+
-+        boolean isIncognitoOnlyBrowser = IncognitoOnlyModeUtil.getInstance()
-+                .isIncognitoOnlyBrowser();
-+        ChromeBaseCheckBoxPreference incognitoOnlyPref =
-+                (ChromeBaseCheckBoxPreference) findPreference(PREF_INCOGNITO_ONLY);
-+        if (isIncognitoOnlyBrowser) {
-+            preferenceScreen.removePreference(incognitoOnlyPref);
-+        } else {
-+            incognitoOnlyPref.setOnPreferenceChangeListener(this);
-         }
- 
-         return true;
-@@ -189,6 +207,13 @@ public class PrivacyPreferences extends PreferenceFragment
-             doNotTrackPref.setSummary(prefServiceBridge.isDoNotTrackEnabled() ? textOn : textOff);
-         }
- 
-+        Preference incognitoOnlyPref = findPreference(PREF_INCOGNITO_ONLY);
-+        if (incognitoOnlyPref != null) {
-+            boolean isIncognitoOnlyEnabled = privacyPrefManager.isIncognitoOnlyEnabled();
-+            incognitoOnlyPref.setChecked(isIncognitoOnlyEnabled);
-+            incognitoOnlyPref.setSummary(isIncognitoOnlyEnabled ? textOn : textOff);
-+        }
-+
-         Preference contextualPref = findPreference(PREF_CONTEXTUAL_SEARCH);
-         if (contextualPref != null) {
-             boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
-@@ -254,4 +279,38 @@ public class PrivacyPreferences extends PreferenceFragment
-         }
-         return false;
-     }
-+
-+    private AlertDialog incognitoOnlyPreferenceDialog(final Preference preference,
-+                                                      final boolean isChecked) {
-+        AlertDialog dialog = new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
-+                .setTitle(isChecked ? R.string.incognito_only_turn_on_title
-+                        : R.string.incognito_only_turn_off_title)
-+                .setMessage(isChecked ? R.string.incognito_only_turn_on_confirmation
-+                        : R.string.incognito_only_turn_off_confirmation)
-+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-+                    @Override
-+                    public void onClick(DialogInterface dialog, int id) {
-+                        ((ChromeBaseCheckBoxPreference) preference).setChecked(!isChecked);
-+                        dialog.dismiss();
-+                    }
-+                })
-+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-+                    @Override
-+                    public void onClick(DialogInterface dialog, int which) {
-+                        PrivacyPreferencesManager.getInstance(getActivity()).
-+                                setIncognitoOnlyEnabled((boolean) isChecked);
-+                        dialog.dismiss();
-+                        ApplicationLifetime.terminate(true);
-+                    }
-+                })
-+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-+                    @Override
-+                    public void onCancel(DialogInterface dialog) {
-+                        ((ChromeBaseCheckBoxPreference) preference).setChecked(!isChecked);
-+                    }
-+                })
-+                .create();
-+
-+        return dialog;
-+    }
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
-index 4ddbd4d..9e2a163 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
-@@ -38,6 +38,7 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
-     private static final String PREF_BANDWIDTH_NO_CELLULAR_OLD = "prefetch_bandwidth_no_cellular";
-     private static final String ALLOW_PRERENDER_OLD = "allow_prefetch";
-     private static final String PREF_PHYSICAL_WEB = "physical_web";
-+    private static final String INCOGNITO_ONLY_PREFERENCE = "incognito_only_preference";
-     private static final int PHYSICAL_WEB_OFF = 0;
-     private static final int PHYSICAL_WEB_ON = 1;
-     private static final int PHYSICAL_WEB_ONBOARDING = 2;
-@@ -339,4 +340,23 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
-         int state = mSharedPreferences.getInt(PREF_PHYSICAL_WEB, PHYSICAL_WEB_ONBOARDING);
-         return (state == PHYSICAL_WEB_ON);
-     }
-+
-+    /**
-+     * Check whether Incognito Only preference is enabled
-+     *
-+     * @return whether Incognito Only preference is enabled, false by default
-+     */
-+    public boolean isIncognitoOnlyEnabled() {
-+        return mSharedPreferences.getBoolean(INCOGNITO_ONLY_PREFERENCE, false);
-+    }
-+
-+    /**
-+     * Sets the Incognito Only preference, which enables the browser to switch to incognito only
-+     * mode
-+     *
-+     * @param enabled A boolean indicating whether to switch to incognito only mode.
-+     */
-+    public void setIncognitoOnlyEnabled(boolean enabled) {
-+        mSharedPreferences.edit().putBoolean(INCOGNITO_ONLY_PREFERENCE, enabled).apply();
-+    }
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-index 344a2ed..d54accf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.preferences.LocationSettings;
- import org.chromium.chrome.browser.preferences.PrefServiceBridge;
- import org.chromium.chrome.browser.preferences.PreferenceUtils;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- 
- import java.util.ArrayList;
- import java.util.List;
-@@ -110,6 +111,13 @@ public class SiteSettingsPreferences extends PreferenceFragment
-     }
- 
-     private void configurePreferences() {
-+        // Remove 'All sites' menu for incognito only browser
-+        boolean isIncognitoOnlyBrowser = IncognitoOnlyModeUtil.getInstance()
-+                .isIncognitoOnlyBrowser();
-+        if (isIncognitoOnlyBrowser) {
-+            getPreferenceScreen().removePreference(findPreference(ALL_SITES_KEY));
-+        }
-+
-         if (mMediaSubMenu) {
-             // The Media sub-menu only contains Protected Content and Autoplay, so remove all other
-             // menus.
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java
-index d90ccc3..ddc30f2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java
-@@ -9,6 +9,7 @@ import android.content.Context;
- import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.device.DeviceClassManager;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.snackbar.Snackbar;
- import org.chromium.chrome.browser.snackbar.SnackbarManager;
- import org.chromium.chrome.browser.tab.Tab;
-@@ -64,7 +65,8 @@ public class UndoBarController implements SnackbarManager.SnackbarController {
-         mTabModelObserver = new EmptyTabModelObserver() {
-             private boolean disableUndo() {
-                 return AccessibilityUtil.isAccessibilityEnabled()
-                        || DeviceClassManager.enableAccessibilityLayout();
-+                        || DeviceClassManager.enableAccessibilityLayout()
-+                        || IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-             }
- 
-             @Override
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java
-index c3e7aa0..b1d758c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.tabmodel;
- import org.chromium.base.ObserverList;
- import org.chromium.base.ThreadUtils;
- import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.tab.Tab;
- 
-@@ -82,7 +83,7 @@ public class IncognitoTabModel implements TabModel {
- 
-         // Only delete the incognito profile if there are no incognito tabs open in any tab
-         // model selector as the profile is shared between them.
-        if (profile != null && !mDelegate.doIncognitoTabsExist()) {
-+        if (profile != null && !(IncognitoNotificationService.getIncognitoTabCount() > 0)) {
-             IncognitoNotificationManager.dismissIncognitoNotification();
- 
-             profile.destroyWhenAppropriate();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-index 5221244..c976cd4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-@@ -5,6 +5,7 @@
- package org.chromium.chrome.browser.tabmodel;
- 
- import org.chromium.base.ObserverList;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
-@@ -40,7 +41,8 @@ public abstract class TabModelSelectorBase implements TabModelSelector {
-         for (int i = 0; i < models.length; i++) {
-             tabModels.add(models[i]);
-         }
-        mActiveModelIndex = startIncognito ? INCOGNITO_TAB_MODEL_INDEX : NORMAL_TAB_MODEL_INDEX;
-+        mActiveModelIndex = (startIncognito ||
-+                             IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled()) ? INCOGNITO_TAB_MODEL_INDEX : NORMAL_TAB_MODEL_INDEX;
-         mTabModels = Collections.unmodifiableList(tabModels);
- 
-         TabModelObserver tabModelObserver = new EmptyTabModelObserver() {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java
-index e69d43c..71893ff 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelSelector.java
-@@ -14,6 +14,7 @@ import android.os.Build;
- import org.chromium.base.ContextUtils;
- import org.chromium.base.VisibleForTesting;
- import org.chromium.chrome.browser.document.DocumentUtils;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationService;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabIdManager;
- import org.chromium.chrome.browser.tabmodel.IncognitoTabModel.IncognitoTabModelDelegate;
-@@ -105,7 +106,7 @@ public class DocumentTabModelSelector extends TabModelSelectorBase implements Ta
-             public boolean doIncognitoTabsExist() {
-                 // TODO(dfalcantara): Devices in document mode do not trigger the TabWindowManager.
-                 //                    Revisit this when we have a Samsung L multi-instance device.
-                return mIncognitoTabModel.getCount() > 0;
-+                return IncognitoNotificationService.getIncognitoTabCount() > 0;
-             }
-         }, mActivityDelegate);
-         initializeTabIdCounter();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
-index 26bb763..b01a165 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
-@@ -52,6 +52,7 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
- import org.chromium.chrome.browser.document.ChromeLauncherActivity;
- import org.chromium.chrome.browser.document.DocumentUtils;
- import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
-+import org.chromium.chrome.browser.incognito.IncognitoOnlyModeUtil;
- import org.chromium.chrome.browser.tab.EmptyTabObserver;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabDelegateFactory;
-@@ -814,6 +815,12 @@ public class WebappActivity extends SingleTabActivity {
-             mBrandColor = (int) mWebappInfo.themeColor();
-         }
- 
-+        boolean incognitoOnly = IncognitoOnlyModeUtil.getInstance().isIncognitoOnlyModeEnabled();
-+        if (incognitoOnly) {
-+            mBrandColor = ApiCompatibilityUtils.getColor(getResources(),
-+                    R.color.incognito_primary_color);
-+        }
-+
-         int taskDescriptionColor =
-                 ApiCompatibilityUtils.getColor(getResources(), R.color.default_primary_color);
- 
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
-index a81975d..f14b395 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -225,6 +225,26 @@ CHAR-LIMIT guidelines:
-         Retry
-       </message>
- 
-+      <!-- Incognito Only mode -->
-+      <message name="IDS_INCOGNITO_ONLY_TITLE" desc="The label for incognito-only toggle option.">
-+        &quot;Incognito Only&quot; mode
-+      </message>
-+      <message name="IDS_INCOGNITO_ONLY_SUMMARY" desc="The summary for incognito-only toggle option.">
-+        Browse using only incognito tabs
-+      </message>
-+      <message name="IDS_INCOGNITO_ONLY_TURN_ON_TITLE" desc="The tooltip for enabling incognito-only mode.">
-+        Enable &quot;Incognito Only&quot; mode
-+      </message>
-+      <message name="IDS_INCOGNITO_ONLY_TURN_OFF_TITLE" desc="The tooltip for disabling incognito-only mode.">
-+        Disable &quot;Incognito Only&quot; mode
-+      </message>
-+      <message name="IDS_INCOGNITO_ONLY_TURN_ON_CONFIRMATION" desc="The confirmation message for turning on incognito-only mode.">
-+        Browser will <ph name="BEGIN_BOLD">&lt;b&gt;</ph>restart<ph name="END_BOLD">&lt;/b&gt;</ph> in incognito-only mode. All opened tabs will be closed.
-+      </message>
-+      <message name="IDS_INCOGNITO_ONLY_TURN_OFF_CONFIRMATION" desc="The confirmation message for turning off incognito-only mode.">
-+        Browser will <ph name="BEGIN_BOLD">&lt;b&gt;</ph>restart<ph name="END_BOLD">&lt;/b&gt;</ph> in regular mode. All opened tabs will be closed.
-+      </message>
-+
-       <!-- Main Preferences -->
-       <message name="IDS_PREFERENCES" desc="Title for Chrome's Settings.">
-         Settings
-diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
-index ba24b98..a576f9d 100644
--- a/chrome/android/java_sources.gni
-+++ b/chrome/android/java_sources.gni
-@@ -491,6 +491,7 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGenerator.java",
-   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java",
-   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationService.java",
-+  "java/src/org/chromium/chrome/browser/incognito/IncognitoOnlyModeUtil.java",
-   "java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java",
-   "java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java",
-   "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
Author	SHA1	Message	Date
csagan5	93b1e3842b	Fixup	2018-01-30 12:34:36 +01:00
csagan5	d4948200ef	Update correct versions for .150	2018-01-30 01:06:09 +01:00
csagan5	1c9384d41f	Some adjustments for install deps failures	2018-01-28 14:31:44 +01:00
csagan5	2291cbe5d0	Use relative paths Use verbose shell commands Update sorting of deps Fix license auto-accept Many other fixes for proper building	2018-01-28 13:36:52 +01:00
csagan5	7c926008fe	Adding stubs for fdroid build Adding gclient helper scripts Call gclient-prepare script	2018-01-28 13:36:34 +01:00