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 · 2018-01-27 13:06:54 +01:00
18 changed files with 43738 additions and 51233 deletions
@@ -1,3 +1,57 @@
+# 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
+* updated AdBlock filters
+* more builds for arm64 architecture
+
+# 63.0.3239.144
+* fixed invalid AdBlock filter rule blocking all connections (https://github.com/bromite/bromite/issues/26)
+* updated AdBlock filters
+
+# 63.0.3239.129
+* updated AdBlock filters
+
+# 63.0.3239.122
+* disable webRTC completely (https://github.com/bromite/bromite/issues/9)
+* hyperlinks sanitization fixed and now accessible from Google logo click
+* now building and publishing SystemWebView apks
+
+# 63.0.3239.118
+* limit impact of AMP-removal to not break tabs (https://github.com/bromite/bromite/issues/20)
+* fix DuckDuckGo and StartPage suggestions (https://github.com/bromite/bromite/issues/19)
+* revert /deep/ and ::shadow feature drop to attempt fixing DevTools support (https://github.com/bromite/bromite/issues/23)
+* remove also ads from search results
+* add Google search engine with English-only results, no RLZ and field trials
+* updated adBlock filters
+* fix build of x86 version (was broken in previous version)
+
+# 63.0.3239.85
+* no suggest URL for DuckDuckGo (https://github.com/bromite/bromite/issues/19)
+* fixed 4chan blocking rule
+* limit AMP links cleanup to search results only (fixes broken images/news result tabs)
+* updated adBlock filters
+
+# 63.0.3239.78
+* correctly set version and build numbers
+* updated adBlock filters
+
+# 63.0.3239.73
+
+# 63.0.3239.64
+* updated adblock filters
+* fixed an issue with incognito new tab
+* permanent disable for ToS/metrics and unused auto-updates check
+
+# 63.0.3239.46
+* removed search engine geolocation default patch
+
+# 63.0.3239.38
+
+# 63.0.3239.27
+
+# 63.0.3239.24
+* convert AMP search results to regular search results
+
 # 63.0.3239.15
 * remove URL tracking from Google search results
 * disable webRTC by default (https://github.com/bromite/bromite/issues/9, still not working proper)
@@ -18,16 +72,16 @@
 * first release with NoChromo adblocking patch
 * Bromite patch: disable NTP remote suggestions
 * added some Inox/Iridium/Ungoogled-Chromium patches, namely:
-** DuckDuckGo search engine
-** disable battery status service
-** disable formatting in OmniBox
-** disable GCM status checks
-** use local fonts instead of fonts from Google servers
-** disable updater pings
-** do not enable Google integrations by default (translation, lookup, etc)
-** disable the ad promo system
-** do not store passwords by default
-** do not fetch Google promotions
-** restore classic NTP
-** only keep cookies until exit
-** block third-party cookies
+   * DuckDuckGo search engine
+   * disable battery status service
+   * disable formatting in OmniBox
+   * disable GCM status checks
+   * use local fonts instead of fonts from Google servers
+   * disable updater pings
+   * do not enable Google integrations by default (translation, lookup, etc)
+   * disable the ad promo system
+   * do not store passwords by default
+   * do not fetch Google promotions
+   * restore classic NTP
+   * only keep cookies until exit
+   * block third-party cookies
@@ -1,10 +1,12 @@
 # Bromite - Take back your browser

-<img src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
+[![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" />

 Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.

-Bromite is only available for Android v4 and above.
+Bromite is only available for Android v4.1 and above.

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

@@ -23,13 +25,19 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 # Features

 * adblocking (currently baked-in, no configuration options available)
-* remove click-tracking from Google search results
+* 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 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.
+
 # 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).
@@ -54,3 +62,8 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 # License

 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
+
+[version-image]: https://img.shields.io/github/release/bromite/bromite.svg?style=flat-square
+[version-url]: https://github.com/bromite/bromite/releases/latest
+[license-image]: https://img.shields.io/github/license/bromite/bromite.svg
+[license-url]: https://github.com/bromite/bromite/blob/master/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,69 +0,0 @@
-From bc266421a13f4967a3d5b49830c338f59e4f2dd5 Mon Sep 17 00:00:00 2001
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Tue, 1 Aug 2017 20:29:56 -0400
-Subject: [PATCH 19/21] stop enabling search engine geolocation by default
-
---
- .../search_geolocation_service.cc                  | 25 ++++++++++------------
- 1 file changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/chrome/browser/android/search_geolocation/search_geolocation_service.cc b/chrome/browser/android/search_geolocation/search_geolocation_service.cc
-index 0ed5540c3262..e5721d53c344 100644
--- a/chrome/browser/android/search_geolocation/search_geolocation_service.cc
-+++ b/chrome/browser/android/search_geolocation/search_geolocation_service.cc
-@@ -208,7 +208,14 @@ void SearchGeolocationService::SetDSEGeolocationSetting(bool setting) {
-   pref.setting = setting;
-   SetDSEGeolocationPref(pref);
- 
-  ResetContentSetting();
-+  url::Origin origin = delegate_->GetDSEOrigin();
-+  if (setting) {
-+      host_content_settings_map_->SetContentSettingDefaultScope(
-+          origin.GetURL(), origin.GetURL(), CONTENT_SETTINGS_TYPE_GEOLOCATION,
-+          std::string(), CONTENT_SETTING_ALLOW);
-+  } else {
-+      ResetContentSetting();
-+  }
- }
- 
- url::Origin SearchGeolocationService::GetDSEOriginIfEnabled() {
-@@ -232,11 +239,7 @@ void SearchGeolocationService::OnDSEChanged() {
-   // Remove any geolocation embargo on the URL.
-   PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveEmbargoByUrl(
-       delegate_->GetDSEOrigin().GetURL(), CONTENT_SETTINGS_TYPE_GEOLOCATION);
-  if (content_setting == CONTENT_SETTING_BLOCK && pref.setting) {
-    pref.setting = false;
-  } else if (content_setting == CONTENT_SETTING_ALLOW && !pref.setting) {
-    ResetContentSetting();
-  }
-+  pref.setting = content_setting == CONTENT_SETTING_ALLOW;
- 
-   if (new_dse_name != pref.dse_name && pref.setting)
-     SearchGeolocationDisclosureTabHelper::ResetDisclosure(profile_);
-@@ -279,7 +282,7 @@ void SearchGeolocationService::InitializeDSEGeolocationSettingIfNeeded() {
- 
-     PrefValue pref;
-     pref.dse_name = delegate_->GetDSEName();
-    pref.setting = content_setting != CONTENT_SETTING_BLOCK;
-+    pref.setting = content_setting == CONTENT_SETTING_ALLOW;
-     SetDSEGeolocationPref(pref);
- 
-     SearchGeolocationDisclosureTabHelper::ResetDisclosure(profile_);
-@@ -289,13 +292,7 @@ void SearchGeolocationService::InitializeDSEGeolocationSettingIfNeeded() {
- void SearchGeolocationService::EnsureDSEGeolocationSettingIsValid() {
-   PrefValue pref = GetDSEGeolocationPref();
-   ContentSetting content_setting = GetCurrentContentSetting();
-  bool new_setting = pref.setting;
-
-  if (pref.setting && content_setting == CONTENT_SETTING_BLOCK) {
-    new_setting = false;
-  } else if (!pref.setting && content_setting == CONTENT_SETTING_ALLOW) {
-    new_setting = true;
-  }
-+  bool new_setting = content_setting == CONTENT_SETTING_ALLOW;
- 
-   if (pref.setting != new_setting) {
-     pref.setting = new_setting;
-- 
-2.14.2
-
@@ -1,14 +1,13 @@
-commit 4035ce612520759de41a4870b0035946deea2efc
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 12 11:06:18 2017 +0200

    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..25e85ab 100644
+index 002b6c0..7b4155b 100644
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -32,12 +32,23 @@
+@@ -32,12 +32,22 @@
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version.
@@ -24,7 +23,6 @@ index 002b6c0..25e85ab 100644
 +      "keyword": "duckduckgo.com",
 +      "favicon_url": "https://duckduckgo.com/favicon.ico",
 +      "search_url": "https://duckduckgo.com/?q={searchTerms}",
-+      "suggest_url": "https://duckduckgo.com/?q={searchTerms}&language={language}&kac=1",
 +      "new_tab_url": "https://duckduckgo.com/",
 +      "type": "SEARCH_ENGINE_DUCKDUCKGO",
 +      "id": 11
@@ -46,7 +44,7 @@ index c19dd0e..02f6b16 100644
 };
 
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
-index 862e001..7adede7 100644
+index 6be17ee..ef50529 100644
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -50,548 +50,548 @@ namespace {
@@ -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,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,4 +1,4 @@
-commit ead3cfcf33af7b007ef266068e9c1a5a512200f4
+commit 3075d5cc23f69b42c80690162426ae2501cd2b5b
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 12 08:09:24 2017 +0200

@@ -18,10 +18,10 @@ index 6b66f9e..ac44881 100644
 
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index 762dc0b..33e81b4 100644
+index a96f159e..7f7e9cf 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -844,7 +844,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+@@ -877,7 +877,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -31,10 +31,10 @@ index 762dc0b..33e81b4 100644
 }
 
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
-index 521f155..6fb04a9 100644
+index e6ccce4..1e37c2b 100644
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -610,7 +610,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);
@@ -42,7 +42,7 @@ index 521f155..6fb04a9 100644
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
   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
@@ -70,7 +70,7 @@ index 6512483..4c55a19 100644
 
 enum class NetworkPredictionStatus {
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 9bfac12..243f176 100644
+index 52042ee..b1acb4a 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
@@ -96,10 +96,10 @@ index b46a992..9d353d9 100644
       </div>
     </dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 01f0f66..e0ce4b1 100644
+index 0f4bdb3..77e4810 100644
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -329,8 +329,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -371,8 +371,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -111,15 +111,15 @@ index 01f0f66..e0ce4b1 100644
 }
 
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 79f4e19..946f7cd 100644
+index bcd4d0e..2302f0f 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -62,11 +62,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(
-       prefs::kEnableTranslate,
-      true,
-+      false,
+-      prefs::kOfferTranslateEnabled, true,
+      prefs::kOfferTranslateEnabled, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
   registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
@@ -170,10 +170,10 @@ index 83a4617..4b8511c 100644
   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 a0e6cae..10a49c3 100644
+index 9468cf2..86366ca 100644
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -274,7 +274,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -211,7 +211,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
@@ -183,7 +183,7 @@ index a0e6cae..10a49c3 100644
   registry->RegisterBooleanPref(
       prefs::kAutofillProfileUseDatesFixed, false,
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
-index a0b9d39..ef0dd6b 100644
+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,
@@ -202,10 +202,10 @@ index a0b9d39..ef0dd6b 100644
   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 2ebf20d..7866663 100644
+index a05123f..4b8b05cb 100644
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -372,9 +372,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -343,9 +343,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -1,68 +0,0 @@
-commit 9032b89c5a4c28d43c5a13f8bc151c71acad874b
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Oct 28 10:09:41 2017 +0200
-
-    Do not track google search results clicks
-
-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 b7c5748..4978c84 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"
-@@ -5825,8 +5826,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
-  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  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) << "BRM: 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
-index 0000000..57a7670
--- /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 "/* click-tracking removal - from https://github.com/Rob--W/dont-track-me-google */\n\nfunction sanitizeHyperlink(a) {\n    var inlineMousedown = a.getAttribute('onmousedown');\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    if (inlineMousedown && /\\ba?rwt\\(/.test(inlineMousedown)) {\n        a.removeAttribute('onmousedown');\n    }\n    var realLink = getRealLinkFromGoogleUrl(a);\n    if (realLink) {\n        a.href = realLink;\n    }\n    a.referrerPolicy = 'origin';\n\n    var ping = a.getAttribute('ping');\n    if (ping && /\\/url\\?/.test(ping)) {\n        a.removeAttribute('oncontextmenu');\n        a.removeAttribute('ping');\n    }\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 === 'www.google.com') &&\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 sanitizeAllHyperlinks() {\n\t// scan all hyperlinks\n\tvar hyperlinks = document.getElementsByTagName('a');\n\tfor(var i = 0; i < hyperlinks.length; i++) {\n\t\tvar a = hyperlinks[i];\n\t\tif (a.href)\n\t\t\tsanitizeHyperlink(a);\n\t}\n}\n\nsanitizeAllHyperlinks();\n"
-+
-+#endif  // dont_track_me_h
@@ -1,29 +1,20 @@
-commit 5fd5caead1e313462bc84c22aab44404af1a918d
+commit a53d9cf12fb835938c2d2ad641633126a07bf636
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:54:53 2017 +0200
+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 dae4dd5..60411ce 100644
+index b756cb0..5785c581 100644
 --- a/chrome/browser/search/search.cc
 +++ b/chrome/browser/search/search.cc
-@@ -170,17 +170,7 @@ struct NewTabURLDetails {
-       return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
+@@ -171,9 +171,6 @@ struct NewTabURLDetails {
 
     NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
-    switch (state) {
+     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);
-      default:
-        // Use the local New Tab otherwise.
-        return NewTabURLDetails(local_url, state);
-    }
-+    return NewTabURLDetails(local_url, state);
-   }
- 
-   GURL url;
+       case NEW_TAB_URL_INCOGNITO:
+         // Incognito has its own New Tab.
+         return NewTabURLDetails(GURL(), state);
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
csagan5	0d6534d9eb	Release 63.0.3239.150	2018-01-27 13:06:54 +01:00
csagan5	b869bb5b7b	Specify minimum Android version as v4.1	2018-01-17 20:41:25 +01:00
csagan5	a6603ca827	Release 63.0.3239.144	2018-01-16 23:34:02 +01:00
csagan5	881b4199f4	Release 63.0.3239.129	2018-01-05 00:52:56 +01:00
csagan5	8f418f10d5	Anti-AMP patch v0.3.5	2017-12-27 23:29:20 +01:00
csagan5	7a436cad38	Latest anti-AMP patch and release notes	2017-12-23 02:27:52 +01:00
csagan5	ba521c5412	Update README	2017-12-16 12:28:56 +01:00
csagan5	23623ffc1f	Add Google EN search engine Update anti-AMP patch	2017-12-16 12:22:24 +01:00
csagan5	ca0a121f19	Updated patches for new release	2017-12-09 12:02:35 +01:00
csagan5	65554f30c6	Release 63.0.3239.78	2017-12-06 15:38:49 +01:00
csagan5	4f1fa500e3	Updated CHANGELOG	2017-12-03 21:18:37 +01:00
csagan5	00ad417ff8	Updated patches for release 63.0.3239.64	2017-11-27 15:04:24 +01:00
csagan5	af04dfea67	Update patch to fix the incognito new tab	2017-11-26 11:59:36 +01:00
csagan5	b26461b55f	Adapted patch to latest Chromium	2017-11-26 11:06:20 +01:00
csagan5	39f5761729	Added explanation for Google Sync Removed no-more-working (and dubious) patch	2017-11-14 08:56:41 +01:00
CarlandGitHub	10cc8c8310	Fixed formatting, added 63.0.3239.38	2017-11-07 23:22:59 +01:00
csagan5	4c844ba92d	Added new release to changelog	2017-11-02 20:49:34 +01:00
csagan5	d855bc2f8f	Add correct URL	2017-10-31 10:27:11 +01:00
csagan5	bffc981dca	Add license shield	2017-10-31 10:25:04 +01:00
csagan5	fc970af553	Add title to logo	2017-10-31 10:21:27 +01:00
csagan5	fb79f25139	Add shield URLs	2017-10-31 10:19:19 +01:00
csagan5	3f68ef470d	Add version badge	2017-10-31 10:17:14 +01:00
csagan5	ce004bc49a	Mention removal of AMP from search results	2017-10-30 17:53:16 +01:00
csagan5	a99533f633	Latest version of the patch with AMP removal	2017-10-30 17:49:04 +01:00