Add missing revert patch to list

Restore index meta to updated Remove-Sync-and-Translate-menu.patch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,16 +4,18 @@ about: Create a Bromite bug report
 
 ---
 
-**Version**
+**Bromite version**
 
-Version: `v67...`
+Version: `69.0...`
 Arch: `arm` or `arm64` or `x86`
+Android version: ... (example: `lollipop`)
 
 **Is the bug reproducible with latest version?**
 `Bug must be reproducible with latest version`
 
 **Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
 `Bug must NOT be reproducible with Chromium to be qualified as a Bromite bug`
+If yes then report it upstream on [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first; all Chromium issues reported here will be closed as `invalid`.
 
 **Is the bug a crash?**
 If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,7 +5,7 @@ about: Suggest a privacy-related idea for this project
 ---
 
 **Is your feature request related to privacy?**
-Only privacy-related feature requests are considered.
+Features that are not related to privacy are unlikely to be considered.
 
 **Is there a patch available for this feature somewhere?**
 ...
@@ -14,4 +14,4 @@ Only privacy-related feature requests are considered.
 A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+A clear and concise description of any alternative solutions or features you have considered.

CHANGELOG.md

@@ -1,5 +1,141 @@
+# 71.0.3578.120
+* fix breakage of translate quick answers by anti-AMP (fixes https://github.com/bromite/bromite/issues/210)
+
+# 71.0.3578.115
+* add AdGuard DNS-over-HTTPS option
+* use green icon for SystemWebView
+
+# 71.0.3578.110
+
+# 71.0.3578.104
+* fix AMP links sanitisation; have it working for news as well (fixes https://github.com/bromite/bromite/issues/202)
+* revert upstream patch responsible for the broken save dialog prompt (upstream: https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+
+# 71.0.3578.101
+
+# 71.0.3578.98
+* do not ask permissions for camera when importing bookmarks (fixes https://github.com/bromite/bromite/issues/200)
+
+# 71.0.3578.88
+* add proxy configuration page (see https://github.com/bromite/bromite/wiki/ProxyConfiguration)
+* use more recent versions in User-Agent (fixes https://github.com/bromite/bromite/issues/156)
+
+# 71.0.3578.85
+* fix blurry adaptive icon (fixes https://github.com/bromite/bromite/issues/197)
+
+# 71.0.3578.76
+
+# 71.0.3578.72
+* add flag to disable IPv6 probes
+
+# 70.0.3538.107
+* added adaptive icon (fixes https://github.com/bromite/bromite/issues/181)
+* do not change randomisation at each call (fixes https://github.com/bromite/bromite/issues/177)
+* do not enable #enable-scroll-anchor-serialization by default
+
+# 70.0.3538.102
+* do not grant notifications to default search engine
+* remove all promos from bookmark manager page
+* re-introduced various patches to eradicate binary blob dependencies (only Cast left)
+* remove contacts picker permission
+
+# 70.0.3538.95
+* fix crash on bookmark edit activity (fixes https://github.com/bromite/bromite/issues/172)
+* fix slow chrome://flags (fixes https://github.com/bromite/bromite/issues/173)
+* enable TLS 1.3 final support by default (fixes https://github.com/bromite/bromite/issues/174)
+* dropped some patches related to GCM/GMS on suspicion of being related to random crashes
+
+# 70.0.3538.87
+* enable history requirement of user gesture (fixes https://github.com/bromite/bromite/issues/171)
+* enable serialization of scroll position changes while loading (fixes https://github.com/bromite/bromite/issues/171)
+* remove passwords keyboard accessory option (fixes https://github.com/bromite/bromite/issues/171)
+* some improvements to bookmark import/export interaction
+* add flag to disable orientation API, disabled by default
+* disable device motion API by default (fixes https://github.com/bromite/bromite/issues/171)
+
+# 70.0.3538.83
+* fix keep session cookies option showing on all site settings views
+* fix blank site settings entry showing (fixes https://github.com/bromite/bromite/issues/166)
+* offer builtin autocomplete for chrome://flags quick access
+
+# 70.0.3538.80
+* add flag to disable video resume functionality, allowing to not pause video playback on tab switch (fixes https://github.com/bromite/bromite/issues/108)
+* prevent "are you there" prompts from appearing when playing videos
+* completely disable update scheduler checks to fix a related crash
+
+# 70.0.3538.77
+* disable generic sensor APIs by default (fixes https://github.com/bromite/bromite/issues/160)
+* introduce flag to disable device motion API (fixes https://github.com/bromite/bromite/issues/160)
+* add Quad9 as a DNS-over-HTTPS (DoH) option (fixes https://github.com/bromite/bromite/issues/140)
+
+# 70.0.3538.71
+* fix bug with canvas fingerprinting (fixes https://github.com/bromite/bromite/issues/154)
+
+# 70.0.3538.67
+* re-enabled DNS-over-HTTPS (DoH) flag (fixes https://github.com/bromite/bromite/issues/139)
+* dropped GCM removal patch
+* disable kSigninAllowedOnNextStartup by default
+* permanently disable query-in-omnibox (fixes https://github.com/bromite/bromite/issues/143)
+
+# 69.0.3497.113
+* disabled DNS-over-HTTPS (DoH) flag, not working since 69.0.3497.73 (see https://github.com/bromite/bromite/issues/139)
+
+# 69.0.3497.109
+
+# 69.0.3497.102
+* ungoogled-chromium: disable network time tracker
+* ungoogled-chromium: remove third-party/analytics
+* ungoogled-chromium: always use local Devtools instead of remote files
+* build without safebrowsing
+* drop "Hide NTP tiles" flag
+
+# 69.0.3497.91
+* fixed crash when accessing site settings media preferences (fixes https://github.com/bromite/bromite/issues/122)
+
+# 69.0.3497.73
+* enabled WebRTC
+* drop clear HTTP cache patch
+
+# 68.0.3440.126
+* add option to disallow custom tab intents (fixes https://github.com/bromite/bromite/issues/117)
+* add option to keep local data until browser exit (fixes https://github.com/bromite/bromite/issues/56)
+* remember preference for tabs persistence option
+* extend anti-AMP to all search results
+
+# 68.0.3440.121
+* add option to not persist tabs across sessions (fixes https://github.com/bromite/bromite/issues/106)
+* always incognito mode (fixes https://github.com/bromite/bromite/issues/18)
+* disable domain reliability (ungoogled-chromium)
+* more efficient adblock interception by using proper handler
+* fix log message about default maximum connections
+* improvement for exit menu patch
+
+# 68.0.3440.110
+* add import action to Bookmarks activity page
+* use different user-agent version based on Android OS version
+
+# 68.0.3440.90
+* reduce rects randomisation by factor of 100
+* use a fixed user-agent (fixes https://github.com/bromite/bromite/issues/103)
+
+# 68.0.3440.87
+* add export action to Bookmarks activity page
+
+# 68.0.3440.81
+* fix issue with filters with an excluded domain option
+
+# 68.0.3440.72
+* fix crash during some canvas rendering (fixes https://github.com/bromite/bromite/issues/95)
+* new approach to adblock filtering (fixes https://github.com/bromite/bromite/issues/90)
+* add a flag to enable higher maximum connections per host limit (fixes https://github.com/bromite/bromite/issues/61)
+* add a flag to disable custom tab intents (fixes https://github.com/bromite/bromite/issues/81)
+* add a flag to have an always-empty new tab page (fixes https://github.com/bromite/bromite/issues/82)
+* reduced randomization of TextMetrics and ClientRects results
+* disable ads metrics by default
+* disable all field trials (fixes https://github.com/bromite/bromite/issues/83)
+* re-introduced own battery API patch (fixes https://github.com/bromite/bromite/issues/80)
+
 # 67.0.3396.107
-* updated AdBlock filters
 * removed patch to use Android Media Player for URLs (fixes https://github.com/bromite/bromite/issues/71)
 
 # 67.0.3396.101
@@ -17,112 +153,90 @@
 * safe_browsing: disable cookie transmission
 * extensions: always show component extensions in the ext list
 * translate: disable fetching of translate languages from server
-* updated AdBlock filters
 
 # 67.0.3396.95
 * reduce headers sent in DoH requests (fixes https://github.com/bromite/bromite/issues/70)
 * serve DoH requests with maximum priority
 * `CloudFlare` -> `Cloudflare` (fixes https://github.com/bromite/bromite/issues/73)
 * fingerprint mitigations: cover also `ConvertToArrayBufferContents`
-* updated AdBlock filters
+* removed redundant own patch for battery API
 
 # 67.0.3396.92
-* improve randomisation for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
-* updated AdBlock filters
+* improve randomization for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
 
 # 67.0.3396.88
 * add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68)
 * disable signin, translate and data saver UI/internal components (fixes https://github.com/bromite/bromite/issues/67)
 * rename `GoogleEN` -> `Google In English` (fixes https://github.com/bromite/bromite/issues/66)
-* re-enabled text metrics and ToDataURL, ToBlob with randomisation of color data (fixes https://github.com/bromite/bromite/issues/52)
+* re-enabled text metrics and ToDataURL, ToBlob with randomization of color data (fixes https://github.com/bromite/bromite/issues/52)
 * open YouTube links in Bromite
 * use Android Media Player for URLs
 * add exit menu item
 * hide "send reports to Google" menu item
-* updated AdBlock filters
 
 # 67.0.3396.82
-* updated AdBlock filters
 
 # 67.0.3396.76
-* updated AdBlock filters
 
 # 67.0.3396.72
 * add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53)
-* updated AdBlock filters
 
 # 67.0.3396.67
-* updated AdBlock filters
 
 # 66.0.3359.202
 * fix DevTools integration (https://github.com/bromite/bromite/issues/23)
 * allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60)
-* updated AdBlock filters
 
 # 66.0.3359.200
-* updated AdBlock filters
 
 # 66.0.3359.196
-* updated AdBlock filters
 
 # 66.0.3359.188
-* updated AdBlock filters
 * increase max (persistent) connections per server from 6 to 15
 * preliminary work for better canvas fingerprinting mitigations
 
 # 66.0.3359.161
-* updated AdBlock filters
 
 # 66.0.3359.148
 * disable permanently all custom tab intents (https://github.com/bromite/bromite/issues/17)
-* updated AdBlock filters
-* reduce randomisation for client rects from 5% to 3%
+* reduce randomization for client rects from 5% to 3%
 
 # 65.0.3325.230
 * fixed permission to access Google account issue (https://github.com/bromite/bromite/issues/11)
-* updated AdBlock filters
 
 # 65.0.3325.218
 * always set WideVine version
-* updated AdBlock filters
 
 # 65.0.3325.204
 * add menu option to toggle global Javascript preferences setting (https://github.com/bromite/bromite/issues/37)
 * add fingeprinting mitigation for getClientRects, getBoundingClientRect
 * set audio latency to fixed number
-* updated AdBlock filters
 
 # 65.0.3325.198
 * re-landed support for third-party AdBlock filters
 * completed patches cleanup
-* updated AdBlock filters
 
 # 65.0.3325.190
 * block some Canvas and AudioBuffer APIs mostly used for fingerprinting (https://github.com/bromite/bromite/issues/15)
-* updated AdBlock filters
 
 # 65.0.3325.176
 * block plugins enumeration API
 * block battery API
 * remove device name and build id from User Agent
 * added Qwant search engine
-* updated AdBlock filters
 * disable non-working 3rd-party filters support
 
 # 64.0.3282.204
 * use H264 NEON optimizations also for arm64
 * fix build of Stable channel
-* updated AdBlock filters
 * started building vanilla Chromium releases as well
 
 # 64.0.3282.193
-* updated AdBlock filters
 * disable reporting
 
 # 64.0.3282.182
 * add support for domain-based adblock filters
 * optimized memory allocation for filters
-* updated AdBlock filters
 
 # 64.0.3282.168
 * extension: allow playing youtube/vimeo videos in background (https://github.com/bromite/bromite/issues/16)
@@ -139,20 +253,16 @@
 * disabled plugin untraceable URLs (ungoogled-chromium)
 
 # 64.0.3282.149
-* updated AdBlock filters
 
 # 63.0.3239.150
 * fixed crash when clicking on address bar lock (page info) or opening site settings (https://github.com/bromite/bromite/issues/28)
 * build H264 with NEON optimizations for ARMv7
-* 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)
@@ -165,23 +275,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
 

README.md

@@ -1,6 +1,6 @@
 # Bromite - Take back your browser
 
-<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> [![license][license-image]][license-url]
+<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> <img src="https://www.bromite.org/license.svg" alt="GNU GPL v3" title="GNU VPL v3" />
 
 <img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
 
@@ -8,9 +8,7 @@ Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad bl
 
 Bromite is only available for Android v4.1 and above.
 
-See [open issues](https://github.com/bromite/bromite/issues) for the development in progress.
-
-<img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" /> <img src="https://www.bromite.org/bromite_bromite_xda_downloads.svg" alt="downloads on XDA Labs" title="downloads on XDA Labs" />
+<img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" />
 
 # Goals
 
@@ -21,8 +19,6 @@ Minimal UI changes are applied to help curbing the idea of "browser as an advert
 
 Please donate to support development of Bromite and the costs for the build system.
 
-Donate via LiberaPay: [![Donate via LiberaPay](https://www.bromite.org/donate.svg)](https://liberapay.com/csagan5/donate)
-
 Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)
 
 Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)
@@ -37,55 +33,78 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 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.
 
+Additionally, these features would not be privacy-friendly.
+
 ## Does Bromite require root?
 No.
 
+## Is Bromite de-googled?
+
+Yes, although this has not been verified (and hardly can be) under all situations; if you were to find connections to cloud-based services please report them via the issue tracker.
+Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset).
+
 ## What is the SystemWebView?
 It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
 
+See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-SystemWebView) for community-contributed installation instructions.
+
 ## How to enable DNS-over-HTTPS?
 
 See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
 
 ## Can you add dark mode/some cool themes?
 No.
-Bromite is about adblocking and privacy.
+Bromite is about privacy and adblocking.
 
 ## Can you add HTTPS everywhere?
 No.
-We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywhere in particular is too invasive to be easily maintained across new releases.
+We cannot add add-ons to Bromite (merely some features).
 
 ## Is Bromite on Play Store?
-No, and this is unlikely to change. The Play Store would not allow total freedom on the adblocking choice, amongst other limitations.
+No, and this is unlikely to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.
+
+Bromite favors user freedom in software choice: the device is yours so you get to choose which software to run on it, end of the story.
 
 ## Is Bromite on F-Droid?
-Not (yet), for technical reasons. This is likely to change in future.
+It is not on the official F-Droid repository and there are no (more) plans to submit it.
+
+You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).
 
 ## Does Bromite support WebRTC?
-No, it is not built-in.
+Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.
 
 # Features
 
 * baked-in adblock engine with filters from EasyList, EasyPrivacy and others
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google/CloudFlare servers
-* allow playing videos in background
+* DNS-over-HTTPS support via Google, Cloudflare, Quad9 and AdGuard servers
+* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
+* chrome flags to disable custom intents and clear session on exit
+* always-incognito mode
+* completely removed safe browsing and other privacy-unfriendly features
+* anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
+* use fixed User-Agent to conceal real model and browser version
 * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
-* webRTC, canvas, audio and other anti-fingerprinting mitigations
+
+## Features not related to privacy
+* import/export bookmarks
+* allow playing videos in background tabs and disable pause on switching tabs
 * all codecs included (proprietary, open H.264 etc.)
 * built with official speed optimizations
 
-You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/build/patches
 
 # Releases
 
-All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device.
+All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device (or none otherwise).
 
 Each tag corresponds to a Chromium Stable release tag.
 
-Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
-Additionally, [SystemWebView](https://www.bromite.org/system_web_view), Monochrome and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK versions 16 and 21; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK21+).
+For every Bromite build you can always find a matching [vanilla Chromium](https://www.bromite.org/chromium) build which is used for example to verify which issues are specific to Bromite or not.
+
+All official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).
 
 ## Integrity and authenticity
 
@@ -95,7 +114,6 @@ $ sha256sum --check brm_68.0.3440.54.sha256.txt
 arm64_SystemWebView.apk: OK
 arm64_ChromePublic.apk: OK
 arm64_ChromeModernPublic.apk: OK
-arm64_MonochromePublic.apk: OK
 ```
 
 If you prefer an UI-based tool, you might want to look into [GtkHash](https://github.com/tristanheaven/gtkhash).
@@ -118,6 +136,9 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags
 
 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.
 
+The GN args used to build Bromite are available here: [GN_ARGS](./GN_ARGS).
+The patches are to be applied second the order specified in the `patches_list.txt` file (you can use `git am`); the big file `adblock_entries.h` (containing all the AdBlock filters) needs to be copied under `src/net/url_request/`.
+
 # Credits
 
 * [Chromium project](https://www.chromium.org/Home) and developers
@@ -127,6 +148,7 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
 * nochromo for the original adblock patch
 * [AdBlock Plus](https://adblockplus.org/), [uBlock Origin](https://github.com/uBlockOrigin), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included
+* [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo
 
 # License
 

build/GN_ARGS

@@ -0,0 +1,30 @@
+android_channel="stable"
+blink_symbol_level=1
+dcheck_always_on=false
+debuggable_apks=false
+enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
+enable_hangout_services_extension=false
+enable_mdns=false
+enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true
+enable_nacl=false
+enable_nacl_nonsfi=false
+enable_remoting=false
+enable_reporting=false
+enable_resource_whitelist_generation=false
+enable_vr=false
+fieldtrial_testing_like_official_build=true
+is_component_build=false
+is_debug=false
+is_official_build=true
+jumbo_file_merge_limit=60
+safe_browsing_mode=0
+strip_absolute_paths_from_debug_symbols=true
+strip_debug_info=false
+symbol_level=1
+target_os="android"
+use_debug_fission=true
+use_errorprone_java_compiler=false
+use_jumbo_build=true
+use_official_google_api_keys=false
+use_openh264=true chrome_pgo_phase=0 full_wpo_on_official=true
+use_sysroot=false

build/patches/Add-DuckDuckGo-search-engine.patch

@@ -711,5 +711,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
      &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-English-only-search-engine.patch

@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Mon, 11 Dec 2017 22:42:11 +0100
-Subject: Add Google English-only engine
+Subject: Add English-only search engine
 
 Add a Google search engine that forces languages to English,
 disable from all its searches RLZ and field experiments querystring parameters.
@@ -17,12 +17,12 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
  
      // Increment this if you change the data in ways that mean users with
      // existing data should get a new version.
--    "kCurrentDataVersion": 101
-+    "kCurrentDataVersion": 102
+-    "kCurrentDataVersion": 104
++    "kCurrentDataVersion": 105
    },
  
    // The following engines are included in country lists and are added to the
-@@ -154,6 +154,27 @@
+@@ -159,6 +159,27 @@
        "id": 1
      },
  
@@ -723,5 +723,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
      &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-Qwant-search-engine.patch

@@ -3,10 +3,10 @@ Date: Mon, 12 Mar 2018 20:31:44 +0100
 Subject: Add Qwant search engine
 
 ---
- .../search_engines/prepopulated_engines.json       |  13 +-
+ .../search_engines/prepopulated_engines.json       |  24 ++-
  components/search_engines/search_engine_type.h     |   1 +
  .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
- 3 files changed, 122 insertions(+), 110 deletions(-)
+ 3 files changed, 133 insertions(+), 110 deletions(-)
 
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
@@ -15,15 +15,26 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
  
      // Increment this if you change the data in ways that mean users with
      // existing data should get a new version.
--    "kCurrentDataVersion": 102
-+    "kCurrentDataVersion": 103
+-    "kCurrentDataVersion": 105
++    "kCurrentDataVersion": 106
    },
  
    // The following engines are included in country lists and are added to the
-@@ -939,6 +939,17 @@
+@@ -954,6 +954,28 @@
        "id": 6
      },
  
++    "qwant": {
++      "name": "Qwant",
++      "keyword": "qwant.com",
++      "favicon_url": "https://www.qwant.com/favicon.ico",
++      "search_url": "https://www.qwant.com/?client=opensearch&q={searchTerms}",
++      "suggest_url": "https://api.qwant.com/api/suggest/?client=opensearch&q={searchTerms}",
++      "image_url": "https://www.qwant.com/?t=images&q={searchTerms}",
++      "type": "SEARCH_ENGINE_QWANT",
++      "id": 14
++    },
++
 +    "qwant": {
 +      "name": "Qwant",
 +      "keyword": "qwant.com",
@@ -711,5 +722,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
      &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-StartPage-search-engine.patch

@@ -15,12 +15,12 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
  
      // Increment this if you change the data in ways that mean users with
      // existing data should get a new version.
--    "kCurrentDataVersion": 100
-+    "kCurrentDataVersion": 101
+-    "kCurrentDataVersion": 103
++    "kCurrentDataVersion": 104
    },
  
    // The following engines are included in country lists and are added to the
-@@ -232,6 +232,16 @@
+@@ -247,6 +247,16 @@
        "id": 56
      },
  
@@ -710,5 +710,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
      &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-a-flag-for-DNS-over-HTTPS.patch

@@ -5,38 +5,41 @@ Subject: Add a flag for DNS-over-HTTPS
 Allow selection between Google and Cloudflare endpoints.
 Serve DoH requests with maximum priority, remove traffic annotation.
 Reduce HTTP headers in DoH requests to bare minimum.
+Add AdGuard (default) endpoint
 
-See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt
+See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt
 ---
- chrome/browser/about_flags.cc                      | 12 +++++++++
+ chrome/browser/about_flags.cc                      | 14 +++++++++++
  chrome/browser/flag_descriptions.cc                |  3 +++
  chrome/browser/flag_descriptions.h                 |  3 +++
- chrome/browser/io_thread.cc                        | 14 +++++++----
- .../common/network_features.cc                     |  5 ++--
- .../common/network_features.h                      |  5 ++--
- .../common/network_switch_list.h                   |  4 +++
+ .../browser/net/system_network_context_manager.cc  | 16 ++++++-------
+ .../common/network_features.cc                     |  7 ++++--
+ .../common/network_features.h                      |  5 +++-
+ .../common/network_switch_list.h                   |  4 ++++
  net/base/load_flags_list.h                         |  6 +++++
- net/dns/dns_transaction.cc                         | 29 +++-------------------
- net/url_request/url_request_http_job.cc            | 28 +++++++++++++--------
- 10 files changed, 64 insertions(+), 45 deletions(-)
+ net/dns/dns_transaction.cc                         | 28 +++-------------------
+ net/url_request/url_request_http_job.cc            | 26 ++++++++++++--------
+ 10 files changed, 65 insertions(+), 47 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -395,6 +395,12 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = {
-      switches::kChromeHomeSwipeLogicType, "velocity"},
+@@ -461,6 +461,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
+      base::size(kCCTModuleCache_ThirtyMinutes), nullptr},
  };
  
 +const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
 +    {features::kDnsOverHttpsChoiceDefault, "", ""},
 +    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
 +    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
++    {features::kDnsOverHttpsChoiceQuad9, switches::kDnsOverHttpsServer, "https://9.9.9.9/dns-query"},
++    {features::kDnsOverHttpsChoiceAdGuard, switches::kDnsOverHttpsServer, "https://dns.adguard.com/dns-query"}
 +};
 +
  #endif  // OS_ANDROID
  
  const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
-@@ -3544,6 +3550,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3659,6 +3667,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kAsyncDns)},
  #endif  // defined(OS_ANDROID)
  
@@ -52,9 +55,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1849,6 +1849,9 @@ const char kAndroidPaymentAppsDescription[] =
- const char kAsyncDnsName[] = "Async DNS resolver";
- const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
+@@ -2209,6 +2209,9 @@ const char kAutoFetchOnNetErrorPageDescription[] =
+     "When enabled, and navigation fails with an offline error, schedule a "
+     "fetch of the page when online again.";
  
 +const char kDnsOverHttpsName[] = "DNS over HTTPS";
 +const char kDnsOverHttpsDescription[] = "Enables DNS-over-HTTPS (experimental).";
@@ -65,9 +68,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -1133,6 +1133,9 @@ extern const char kAndroidPaymentAppsDescription[];
- extern const char kAsyncDnsName[];
- extern const char kAsyncDnsDescription[];
+@@ -1343,6 +1343,9 @@ extern const char kAsyncDnsDescription[];
+ extern const char kAutoFetchOnNetErrorPageName[];
+ extern const char kAutoFetchOnNetErrorPageDescription[];
  
 +extern const char kDnsOverHttpsName[];
 +extern const char kDnsOverHttpsDescription[];
@@ -75,66 +78,69 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
  extern const char kAutofillAccessoryViewName[];
  extern const char kAutofillAccessoryViewDescription[];
  
-diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
---- a/chrome/browser/io_thread.cc
-+++ b/chrome/browser/io_thread.cc
-@@ -53,6 +53,7 @@
- #include "components/metrics/metrics_service.h"
- #include "components/net_log/chrome_net_log.h"
- #include "components/network_session_configurator/common/network_features.h"
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
++++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -22,6 +22,7 @@
+ #include "chrome/browser/component_updater/sth_set_component_installer.h"
+ #include "chrome/browser/io_thread.h"
+ #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
 +#include "components/network_session_configurator/common/network_switches.h"
- #include "components/policy/core/common/policy_service.h"
- #include "components/policy/policy_constants.h"
- #include "components/prefs/pref_registry_simple.h"
-@@ -383,13 +384,16 @@ IOThread::IOThread(
-                                       base::Unretained(this)));
-   dns_client_enabled_.MoveToThread(io_thread_proxy);
- 
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/ssl/ssl_config_service_manager.h"
+ #include "chrome/common/channel_info.h"
+@@ -389,15 +390,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+                                     base::Value(ShouldEnableAsyncDns()));
+   base::ListValue default_doh_servers;
+   base::ListValue default_doh_server_methods;
 -  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
-+  std::string dnsOverHttpsServer =
+-    std::string server(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "server"));
+-    std::string method(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "method"));
+-    if (!server.empty()) {
+-      default_doh_servers.AppendString(server);
+-      default_doh_server_methods.AppendString(method);
+-    }
++  std::string server =
 +      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
 +      switches::kDnsOverHttpsServer);
-+  if (!dnsOverHttpsServer.empty()) {
-     base::Value specs(base::Value::Type::LIST);
-     base::Value methods(base::Value::Type::LIST);
--    base::Value spec(variations::GetVariationParamValueByFeature(
--        features::kDnsOverHttps, "server"));
--    base::Value method(variations::GetVariationParamValueByFeature(
--        features::kDnsOverHttps, "method"));
-+
-+    base::Value spec(dnsOverHttpsServer);
-+    base::Value method("POST");
-+
-     if (spec.GetString().size() > 0) {
-       specs.GetList().push_back(std::move(spec));
-       methods.GetList().push_back(std::move(method));
++  if (!server.empty()) {
++    default_doh_servers.AppendString(server);
++    default_doh_server_methods.AppendString("POST");
+   }
+   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsServers,
+                                     std::move(default_doh_servers));
 diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
 --- a/components/network_session_configurator/common/network_features.cc
 +++ b/components/network_session_configurator/common/network_features.cc
-@@ -9,7 +9,8 @@ namespace features {
- const base::Feature kTokenBinding{"token-binding",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -10,7 +10,10 @@ namespace features {
+ 
+ const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT};
  
 -const base::Feature kDnsOverHttps{"dns-over-https",
 -                                  base::FEATURE_DISABLED_BY_DEFAULT};
 +const char kDnsOverHttpsChoiceDefault[] = "Disabled",
 +                 kDnsOverHttpsChoiceGoogle[] = "Google",
-+                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare";
++                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
++                 kDnsOverHttpsChoiceQuad9[] = "Quad9",
++                 kDnsOverHttpsChoiceAdGuard[] = "AdGuard";
  
  }  // namespace features
 diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
 --- a/components/network_session_configurator/common/network_features.h
 +++ b/components/network_session_configurator/common/network_features.h
-@@ -14,9 +14,10 @@ namespace features {
- // (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
+@@ -13,9 +13,12 @@ namespace features {
+ // Enables Channel ID.
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
  
 -// Enabled DNS over HTTPS
 +// DNS over HTTPS server endpoint choices
- // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
--NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
+ // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
 +NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
-+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[];
++   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[], kDnsOverHttpsChoiceQuad9[],
++   kDnsOverHttpsChoiceAdGuard[];
  
  }  // namespace features
  
@@ -155,20 +161,23 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
 --- a/net/base/load_flags_list.h
 +++ b/net/base/load_flags_list.h
-@@ -92,3 +92,9 @@ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION, 1 << 16)
- // Indicates that the cache should not check that the request matches the
- // response's vary header.
- LOAD_FLAG(SKIP_VARY_CHECK, 1 << 17)
+@@ -92,6 +92,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 14)
+ LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 15)
+ 
+ // Indicates that this request is not to be migrated to a cellular network when
 +
 +// This load will not send Accept-Language or User-Agent headers, and not
 +// advertise brotli encoding.
 +// Used to comply with IETF (draft) DNS-over-HTTPS:
 +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests."
 +LOAD_FLAG(MINIMAL_HEADERS, 1 << 18)
+ // QUIC connection migration is enabled.
+ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 16)
+ 
 diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 --- a/net/dns/dns_transaction.cc
 +++ b/net/dns/dns_transaction.cc
-@@ -391,30 +391,8 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+@@ -358,30 +358,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
  
      HttpRequestHeaders extra_request_headers;
      extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType);
@@ -196,20 +205,19 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
 -                                          "is disabled by default"
 -        }
 -      )"));
-+    //extra_request_headers.SetHeader(HttpRequestHeaders::kUserAgent, "DoH client");
 +    request_ = url_request_context->CreateRequest(url, request_priority_, this);
      net_log_ = request_->net_log();
  
      if (use_post) {
-@@ -432,6 +410,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
-     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
-                            LOAD_BYPASS_PROXY | LOAD_DO_NOT_SEND_COOKIES |
-                            LOAD_DO_NOT_SAVE_COOKIES |
-+                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
-                            LOAD_DO_NOT_SEND_AUTH_DATA);
-   }
+@@ -397,6 +374,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
  
-@@ -851,7 +830,7 @@ class DnsTransactionImpl : public DnsTransaction,
+     request_->SetExtraRequestHeaders(extra_request_headers);
+     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
++                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
+                            LOAD_BYPASS_PROXY);
+     request_->set_allow_credentials(false);
+   }
+@@ -819,7 +797,7 @@ class DnsTransactionImpl : public DnsTransaction,
          had_tcp_attempt_(false),
          doh_attempt_(false),
          first_server_index_(0),
@@ -229,18 +237,17 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
 -  // instance WebCore::FrameLoader::HideReferrer.
 -  if (referrer.is_valid()) {
 -    request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
--                                          referrer.spec());
 +  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
 +    // Our consumer should have made sure that this is a safe referrer. See for
 +    // instance WebCore::FrameLoader::HideReferrer.
 +    if (referrer.is_valid()) {
 +      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
-+                                            referrer.spec());
+                                           referrer.spec());
 +    }
    }
  
-   request_info_.token_binding_referrer = request_->token_binding_referrer();
- 
+   // This should be kept in sync with the corresponding code in
+   // URLRequest::GetUserAgent.
 -  request_info_.extra_headers.SetHeaderIfMissing(
 +  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
 +    request_info_.extra_headers.SetHeaderIfMissing(
@@ -251,7 +258,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
  
    AddExtraHeaders();
    AddCookieHeaderAndStart();
-@@ -663,10 +667,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
+@@ -664,10 +668,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
            HttpRequestHeaders::kAcceptEncoding)) {
      // Advertise "br" encoding only if transferred data is opaque to proxy.
      bool advertise_brotli = false;
@@ -268,7 +275,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
        }
      }
  
-@@ -683,7 +689,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
+@@ -684,7 +690,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
                                            advertised_encodings);
    }
  
@@ -278,5 +285,5 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
      // specified.
      std::string accept_language =
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-an-always-incognito-mode.patch

@@ -0,0 +1,315 @@
+From: Ryan Archer <ryan.bradley.archer@gmail.com>
+Date: Wed, 2 Aug 2017 01:41:28 -0400
+Subject: Add an always-incognito mode
+
+More specifically, add a preference that causes all new tabs and all
+clicked links to launch as incognito.
+---
+ .../android/java/res/xml/privacy_preferences.xml   |  5 ++
+ .../browser/AlwaysIncognitoLinkInterceptor.java    | 72 ++++++++++++++++++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  4 ++
+ .../chrome/browser/appmenu/AppMenuHandler.java     | 12 ++++
+ .../contextmenu/ChromeContextMenuPopulator.java    |  9 ++-
+ .../chrome/browser/tabmodel/ChromeTabCreator.java  | 24 +++++++-
+ .../java/strings/android_chrome_strings.grd        |  6 ++
+ chrome/android/java_sources.gni                    |  1 +
+ 8 files changed, 131 insertions(+), 2 deletions(-)
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
+
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -35,6 +35,11 @@
+         android:key="usage_and_crash_reports"
+         android:title="@string/usage_and_crash_reports_title_legacy"
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.UsageAndCrashReportsPreferenceFragment" />
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
++        android:key="always_incognito"
++        android:title="@string/always_incognito_title"
++        android:summary="@string/always_incognito_summary"
++        android:defaultValue="false" />
+     <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
+         android:key="do_not_track"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
+@@ -0,0 +1,72 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++package org.chromium.chrome.browser;
++
++import android.content.SharedPreferences;
++
++import org.chromium.chrome.browser.tab.EmptyTabObserver;
++import org.chromium.chrome.browser.tab.Tab;
++import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
++import org.chromium.chrome.browser.tabmodel.TabModel;
++import org.chromium.content_public.browser.LoadUrlParams;
++
++import java.util.HashMap;
++import java.util.HashSet;
++import java.util.Map;
++import java.util.Set;
++/**
++ * A {@link TabObserver} that implements the always-incognito preference behavior for links. When the preference is set
++ * to true, it intercepts links opened within observed {@link Tab}s and opens them in new incognito <code>Tab</code>s instead.
++ */
++public class AlwaysIncognitoLinkInterceptor extends EmptyTabObserver {
++
++    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
++
++    private final SharedPreferences alwaysIncognitoContainer;
++    private final Map<Tab, String> lastUrls;
++    private final Set<Tab> revertingTabs;
++
++    public AlwaysIncognitoLinkInterceptor(final SharedPreferences alwaysIncognitoContainer) {
++
++        assert alwaysIncognitoContainer != null;
++
++        this.alwaysIncognitoContainer = alwaysIncognitoContainer;
++        lastUrls = new HashMap<Tab, String>();
++        revertingTabs = new HashSet<Tab>();
++    }
++
++    @Override
++    public void onDestroyed(final Tab tab)
++    {
++        lastUrls.remove(tab);
++        revertingTabs.remove(tab);
++    }
++
++    @Override
++    public void onUpdateUrl(final Tab tab, final String url) {
++
++        if (tab == null) return;
++        if (url == null) return;
++        if (tab.isIncognito()) return;
++        if (alwaysIncognitoContainer == null) return;
++
++        final String lastUrl = lastUrls.put(tab, url);
++
++        if (!alwaysIncognitoContainer.getBoolean(PREF_ALWAYS_INCOGNITO, false)) return;
++        if (revertingTabs.contains(tab)) {
++            revertingTabs.remove(tab);
++            return;
++        }
++
++        tab.getActivity().getTabCreator(true).createNewTab(new LoadUrlParams(url), TabModel.TabLaunchType.FROM_LINK, tab);
++
++        if ((url.equals(lastUrl)) || (!tab.canGoBack())) {
++            // this call was triggered by a reload
++        } else {
++            revertingTabs.add(tab);
++            tab.goBack();
++        }
++    }
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -249,6 +249,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
+ 
+     // Observes when sync becomes ready to create the mContextReporter.
++    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
+     private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
+ 
+     private ChromeFullscreenManager mFullscreenManager;
+@@ -1707,6 +1708,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             throw new IllegalStateException(
+                     "Attempting to access TabCreator before initialization");
+         }
++        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)) {
++            return mIncognitoTabCreator;
++        }
+         return incognito ? mIncognitoTabCreator : mRegularTabCreator;
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java
+@@ -17,6 +17,7 @@ import android.view.View;
+ import android.widget.PopupMenu;
+ 
+ import org.chromium.base.metrics.RecordUserAction;
++import org.chromium.base.ContextUtils;
+ import org.chromium.chrome.R;
+ 
+ import java.util.ArrayList;
+@@ -26,6 +27,9 @@ import java.util.ArrayList;
+  * AppMenuObservers about these actions.
+  */
+ public class AppMenuHandler {
++
++    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
++
+     private AppMenu mAppMenu;
+     private AppMenuDragHelper mAppMenuDragHelper;
+     private Menu mMenu;
+@@ -167,6 +171,14 @@ public class AppMenuHandler {
+         if (mDelegate.shouldShowHeader(appRect.height())) {
+             headerResourceId = mDelegate.getHeaderResourceId();
+         }
++
++        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)) {
++            final MenuItem newTabOption = mAppMenu.getMenu().findItem(R.id.new_tab_menu_id);
++            if (newTabOption != null) {
++                newTabOption.setVisible(false);
++            }
++        }
++
+         mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y,
+                 footerResourceId, headerResourceId, mHighlightMenuId, showFromBottom);
+         mAppMenuDragHelper.onShow(startDragging);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+@@ -14,6 +14,7 @@ import android.webkit.MimeTypeMap;
+ 
+ import org.chromium.base.library_loader.LibraryProcessType;
+ import org.chromium.base.metrics.RecordHistogram;
++import org.chromium.base.ContextUtils;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
+@@ -43,6 +44,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+     private static final String TAG = "CCMenuPopulator";
+     private final ContextMenuItemDelegate mDelegate;
+     private final @ContextMenuMode int mMode;
++    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
+ 
+     /**
+      * Defines the Groups of each Context Menu Item
+@@ -246,7 +248,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+             if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL
+                     && !isEmptyUrl(params.getUrl())
+                     && UrlUtilities.isAcceptedScheme(params.getUrl())) {
+-                linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
++                if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)
++                       && !mDelegate.isIncognito()) {
++                    // disallow open in new tab
++                } else {
++                    linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
++                }
+                 if (!mDelegate.isIncognito() && mDelegate.isIncognitoSupported()) {
+                     linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_INCOGNITO_TAB));
+                 }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
+@@ -7,8 +7,10 @@ package org.chromium.chrome.browser.tabmodel;
+ import android.content.Intent;
+ import android.text.TextUtils;
+ 
++import org.chromium.base.ContextUtils;
+ import org.chromium.base.SysUtils;
+ import org.chromium.base.TraceEvent;
++import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.chrome.browser.ChromeActivity;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.IntentHandler;
+@@ -19,6 +21,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabDelegateFactory;
++import org.chromium.chrome.browser.tab.TabObserver;
+ import org.chromium.chrome.browser.tab.TabRedirectHandler;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
+@@ -37,6 +40,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+ 
+     private final ChromeActivity mActivity;
+     private final boolean mIncognito;
++    private final TabObserver mExtraLogic;
+ 
+     private WindowAndroid mNativeWindow;
+     private TabModel mTabModel;
+@@ -48,6 +52,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+         mActivity = activity;
+         mNativeWindow = nativeWindow;
+         mIncognito = incognito;
++        if (!mIncognito) {
++            mExtraLogic = new AlwaysIncognitoLinkInterceptor(ContextUtils.getAppSharedPreferences());
++        } else {
++            mExtraLogic = null;
++        }
+     }
+ 
+     @Override
+@@ -160,6 +169,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+                         tab.getWebContents());
+             }
+ 
++            if (mExtraLogic != null) {
++                tab.addObserver(mExtraLogic);
++            }
++
+             mTabModel.addTab(tab, position, type);
+             return tab;
+         } finally {
+@@ -200,6 +213,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+         Tab tab = Tab.createLiveTab(
+                 Tab.INVALID_TAB_ID, mIncognito, mNativeWindow, type, parentId, !openInForeground);
+         tab.initialize(webContents, mTabContentManager, delegateFactory, !openInForeground, false);
++
++        if (mExtraLogic != null) {
++            tab.addObserver(mExtraLogic);
++        }
++
+         mTabModel.addTab(tab, position, type);
+         return true;
+     }
+@@ -243,7 +261,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+      */
+     public Tab launchUrlFromExternalApp(String url, String referer, String headers,
+             String appId, boolean forceNewTab, Intent intent, long intentTimestamp) {
+-        assert !mIncognito;
+         boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName());
+ 
+         // If an external app sends an intent for a Weblite URL and the Data Reduction Proxy is
+@@ -303,6 +320,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+         tab.initialize(
+                 null, mTabContentManager, createDefaultTabDelegateFactory(), !selectTab, false);
+         assert state.isIncognito() == mIncognito;
++
++        if (mExtraLogic != null) {
++            tab.addObserver(mExtraLogic);
++        }
++
+         mTabModel.addTab(tab, index, TabLaunchType.FROM_RESTORE);
+         return tab;
+     }
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -691,6 +691,12 @@ CHAR-LIMIT guidelines:
+       <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
+         Sends some system information and page content to Google
+       </message>
++      <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
++        Open links in incognito tabs always
++      </message>
++      <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
++        Opens links in incognito tabs when you click on new tab or on a link
++      </message>
+       <message name="IDS_SAFE_BROWSING_TITLE" desc="Title for safe browsing.">
+         Safe Browsing
+       </message>
+diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
+--- a/chrome/android/java_sources.gni
++++ b/chrome/android/java_sources.gni
+@@ -8,6 +8,7 @@ import("//device/vr/buildflags/buildflags.gni")
+ import("//chrome/android/feed/feed_java_sources.gni")
+ 
+ chrome_java_sources = [
++  "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java",
+   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
+   "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
+   "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
+-- 
+2.11.0
+

build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch

@@ -0,0 +1,876 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 1 Aug 2018 09:19:40 +0200
+Subject: Add bookmark import/export actions in bookmarks activity and page
+
+Thanks to Arnaud for the snippet on how to add toast notifications
+---
+ .../java/res/menu/bookmark_action_bar_menu.xml     |  14 ++
+ .../browser/bookmarks/BookmarkActionBar.java       |  12 ++
+ .../chrome/browser/bookmarks/BookmarkActivity.java |  19 ++
+ .../chrome/browser/bookmarks/BookmarkBridge.java   |  56 ++++++
+ .../chrome/browser/bookmarks/BookmarkDelegate.java |  10 +
+ .../chrome/browser/bookmarks/BookmarkManager.java  |  20 ++
+ .../chrome/browser/bookmarks/BookmarkPage.java     |   1 +
+ .../java/strings/android_chrome_strings.grd        |   6 +
+ chrome/browser/BUILD.gn                            |   8 +-
+ .../browser/android/bookmarks/bookmark_bridge.cc   | 215 +++++++++++++++++++++
+ chrome/browser/android/bookmarks/bookmark_bridge.h |  20 +-
+ chrome/browser/importer/profile_writer.cc          |   2 +
+ chrome/common/BUILD.gn                             |   3 +
+ chrome/utility/BUILD.gn                            |   7 +-
+ chrome/utility/importer/bookmark_html_reader.cc    |  27 ++-
+ chrome/utility/importer/bookmark_html_reader.h     |   9 +
+ 16 files changed, 419 insertions(+), 10 deletions(-)
+
+diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+--- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
++++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+@@ -22,6 +22,20 @@
+             app:showAsAction="ifRoom"
+             app:iconTint="@color/dark_mode_tint" />
+         <item
++            android:id="@+id/import_menu_id"
++            android:icon="@drawable/add_circle_blue"
++            android:title="@string/import_bookmarks"
++            android:visible="true"
++            app:showAsAction="ifRoom"
++            app:iconTint="@color/dark_mode_tint" />
++        <item
++            android:id="@+id/export_menu_id"
++            android:icon="@drawable/ic_file_download_white_24dp"
++            android:title="@string/export_bookmarks"
++            android:visible="true"
++            app:showAsAction="ifRoom"
++            app:iconTint="@color/dark_mode_tint" />
++        <item
+             android:id="@+id/close_menu_id"
+             android:icon="@drawable/btn_close"
+             android:title="@string/bookmark_action_bar_close"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+@@ -89,6 +89,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+         } else if (menuItem.getItemId() == R.id.search_menu_id) {
+             mDelegate.openSearchUI();
+             return true;
++        } else if (menuItem.getItemId() == R.id.import_menu_id) {
++            mDelegate.importBookmarks();
++            return true;
++        } else if (menuItem.getItemId() == R.id.export_menu_id) {
++            mDelegate.exportBookmarks();
++            return true;
+         }
+ 
+         SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
+@@ -132,6 +138,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+     void showLoadingUi() {
+         setTitle(null);
+         setNavigationButton(NAVIGATION_BUTTON_NONE);
++        getMenu().findItem(R.id.import_menu_id).setVisible(false);
++        getMenu().findItem(R.id.export_menu_id).setVisible(false);
+         getMenu().findItem(R.id.search_menu_id).setVisible(false);
+         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
+     }
+@@ -141,6 +149,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+         super.showNormalView();
+ 
+         if (mDelegate == null) {
++            getMenu().findItem(R.id.import_menu_id).setVisible(false);
++            getMenu().findItem(R.id.export_menu_id).setVisible(false);
+             getMenu().findItem(R.id.search_menu_id).setVisible(false);
+             getMenu().findItem(R.id.edit_menu_id).setVisible(false);
+         }
+@@ -173,6 +183,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+     public void onFolderStateSet(BookmarkId folder) {
+         mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
+ 
++        getMenu().findItem(R.id.import_menu_id).setVisible(true);
++        getMenu().findItem(R.id.export_menu_id).setVisible(true);
+         getMenu().findItem(R.id.search_menu_id).setVisible(true);
+         getMenu().findItem(R.id.edit_menu_id).setVisible(mCurrentFolder.isEditable());
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
+@@ -12,6 +12,7 @@ import org.chromium.base.VisibleForTesting;
+ import org.chromium.chrome.browser.SnackbarActivity;
+ import org.chromium.chrome.browser.UrlConstants;
+ import org.chromium.components.bookmarks.BookmarkId;
++import org.chromium.ui.base.ActivityWindowAndroid;
+ 
+ /**
+  * The activity that displays the bookmark UI on the phone. It keeps a {@link BookmarkManager}
+@@ -21,6 +22,7 @@ import org.chromium.components.bookmarks.BookmarkId;
+ public class BookmarkActivity extends SnackbarActivity {
+ 
+     private BookmarkManager mBookmarkManager;
++    private ActivityWindowAndroid mWindowAndroid;
+     static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
+     public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId";
+ 
+@@ -32,6 +34,22 @@ public class BookmarkActivity extends SnackbarActivity {
+         if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;
+         mBookmarkManager.updateForUrl(url);
+         setContentView(mBookmarkManager.getView());
++
++        final boolean listenToActivityState = true;
++        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState);
++        mWindowAndroid.restoreInstanceState(savedInstanceState);
++        mBookmarkManager.setWindow(mWindowAndroid);
++        // Set up the animation placeholder to be the SurfaceView. This disables the
++        // SurfaceView's 'hole' clipping during animations that are notified to the window.
++//        mWindowAndroid.setAnimationPlaceholderView(
++//                mBookmarkManager.getContentViewRenderView().getSurfaceView());
++    }
++
++    @Override
++    protected void onSaveInstanceState(Bundle outState) {
++        super.onSaveInstanceState(outState);
++
++        mWindowAndroid.saveInstanceState(outState);
+     }
+ 
+     @Override
+@@ -48,6 +66,7 @@ public class BookmarkActivity extends SnackbarActivity {
+     @Override
+     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+         super.onActivityResult(requestCode, resultCode, data);
++        mWindowAndroid.onActivityResult(requestCode, resultCode, data);
+         if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
+             BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getStringExtra(
+                     INTENT_VISIT_BOOKMARK_ID));
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+@@ -4,7 +4,11 @@
+ 
+ package org.chromium.chrome.browser.bookmarks;
+ 
++import android.content.Intent;
++import android.content.Context;
++import android.net.Uri;
+ import android.os.SystemClock;
++import android.provider.Browser;
+ import android.text.TextUtils;
+ import android.util.Pair;
+ 
+@@ -13,11 +17,16 @@ import org.chromium.base.ObserverList;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.metrics.RecordHistogram;
++import org.chromium.chrome.browser.document.ChromeLauncherActivity;
++import org.chromium.chrome.browser.IntentHandler;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkType;
+ import org.chromium.components.url_formatter.UrlFormatter;
++import org.chromium.ui.base.PageTransition;
++import org.chromium.ui.base.WindowAndroid;
++import org.chromium.ui.widget.Toast;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -508,6 +517,24 @@ public class BookmarkBridge {
+     }
+ 
+     /**
++     * Import bookmarks from a selected file.
++     * @param window The current window of the bookmarks activity or page.
++     */
++    public void importBookmarks(WindowAndroid window) {
++        assert mIsNativeBookmarkModelLoaded;
++        nativeImportBookmarks(mNativeBookmarkBridge, window);
++    }
++
++    /**
++     * Export bookmarks to a path selected by the user.
++     * @param window The current window of the bookmarks activity or page.
++     */
++    public void exportBookmarks() {
++        assert mIsNativeBookmarkModelLoaded;
++        nativeExportBookmarks(mNativeBookmarkBridge);
++    }
++
++    /**
+      * Synchronously gets a list of bookmarks that match the specified search query.
+      * @param query Keyword used for searching bookmarks.
+      * @param maxNumberOfResult Maximum number of result to fetch.
+@@ -840,6 +867,33 @@ public class BookmarkBridge {
+         depthList.add(depth);
+     }
+ 
++
++    @CalledByNative
++    public void bookmarksImported() {
++        Context context = ContextUtils.getApplicationContext();
++
++        //TODO: call this after actual import
++        //Toast.makeText(ContextUtils.getApplicationContext(), "Bookmarks imported", Toast.LENGTH_LONG).show();
++    }
++
++    @CalledByNative
++    public void bookmarksExported(String bookmarksPath) {
++        Context context = ContextUtils.getApplicationContext();
++
++        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("file://" + bookmarksPath));
++        intent.putExtra(Browser.EXTRA_APPLICATION_ID,
++                        context.getPackageName());
++        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
++        intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK);
++
++        // If the bookmark manager is shown in a tab on a phone (rather than in a separate
++        // activity) the component name may be null. Send the intent through
++        // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012.
++        intent.setClass(context, ChromeLauncherActivity.class);
++
++        IntentHandler.startActivityForTrustedIntent(intent);
++    }
++
+     private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
+         List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
+         for (int i = 0; i < left.length; i++) {
+@@ -906,6 +960,8 @@ public class BookmarkBridge {
+             boolean getFolders, boolean getBookmarks, List<BookmarkId> bookmarksList);
+     private native BookmarkId nativeGetChildAt(long nativeBookmarkBridge, long id, int type,
+             int index);
++    private native void nativeImportBookmarks(long nativeBookmarkBridge, WindowAndroid window);
++    private native void nativeExportBookmarks(long nativeBookmarkBridge);
+     private native int nativeGetTotalBookmarkCount(long nativeBookmarkBridge, long id, int type);
+     private native void nativeSetBookmarkTitle(long nativeBookmarkBridge, long id, int type,
+             String title);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
+@@ -69,6 +69,16 @@ interface BookmarkDelegate {
+     void openSearchUI();
+ 
+     /**
++     * Imports bookmarks from user-selected file.
++     */
++    void importBookmarks();
++
++    /**
++     * Exports bookmarks to downloads directory.
++     */
++    void exportBookmarks();
++
++    /**
+      * Dismisses the search UI.
+      */
+     void closeSearchUI();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
+@@ -21,6 +21,7 @@ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
+ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
++import org.chromium.chrome.browser.ChromeActivity;
+ import org.chromium.chrome.browser.favicon.LargeIconBridge;
+ import org.chromium.chrome.browser.native_page.BasicNativePage;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
+@@ -31,6 +32,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
+ import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
+ import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
+ import org.chromium.components.bookmarks.BookmarkId;
++import org.chromium.ui.base.ActivityWindowAndroid;
+ 
+ import java.util.Stack;
+ 
+@@ -55,6 +57,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+     private Activity mActivity;
+     private ViewGroup mMainView;
+     private BookmarkModel mBookmarkModel;
++    private ActivityWindowAndroid mWindowAndroid;
+     private BookmarkUndoController mUndoController;
+     private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
+     private BasicNativePage mNativePage;
+@@ -267,6 +270,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+     }
+ 
+     /**
++     * Sets the Android window that is used by further intents created by the bookmark activity.
++     */
++    public void setWindow(ActivityWindowAndroid window) {
++        mWindowAndroid = window;
++    }
++
++    /**
+      * @return Current URL representing the UI state of bookmark manager. If no state has been shown
+      *         yet in this session, on phone return last used state stored in preference; on tablet
+      *         return the url previously set by {@link #updateForUrl(String)}.
+@@ -414,6 +424,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+     }
+ 
+     @Override
++    public void importBookmarks() {
++        mBookmarkModel.importBookmarks(mWindowAndroid);
++    }
++
++    @Override
++    public void exportBookmarks() {
++        mBookmarkModel.exportBookmarks();
++    }
++
++    @Override
+     public void openSearchUI() {
+         setState(BookmarkUIState.createSearchState());
+         mSelectableListLayout.onStartSearch();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
+@@ -35,6 +35,7 @@ public class BookmarkPage extends BasicNativePage {
+         mManager = new BookmarkManager(
+                 activity, false, ((SnackbarManageable) activity).getSnackbarManager());
+         mManager.setBasicNativePage(this);
++        mManager.setWindow(activity.getWindowAndroid());
+         mTitle = activity.getString(R.string.bookmarks);
+     }
+ 
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -224,6 +224,12 @@ CHAR-LIMIT guidelines:
+       <message name="IDS_SEARCH" desc="The label for a search button.">
+         Search
+       </message>
++      <message name="IDS_IMPORT_BOOKMARKS" desc="The label for the import bookmarks button.">
++        Import
++      </message>
++      <message name="IDS_EXPORT_BOOKMARKS" desc="The label for an export bookmarks button.">
++        Export
++      </message>
+       <message name="IDS_SHOW_INFO" desc="The label for a info button to show info.">
+         Show Info
+       </message>
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -149,6 +149,10 @@ jumbo_split_static_library("browser") {
+     "bitmap_fetcher/bitmap_fetcher_service.h",
+     "bitmap_fetcher/bitmap_fetcher_service_factory.cc",
+     "bitmap_fetcher/bitmap_fetcher_service_factory.h",
++    "importer/profile_writer.cc",
++    "importer/profile_writer.h",
++    "bookmarks/bookmark_html_writer.cc",
++    "bookmarks/bookmark_html_writer.h",
+     "bookmarks/bookmark_model_factory.cc",
+     "bookmarks/bookmark_model_factory.h",
+     "bookmarks/bookmark_stats.cc",
+@@ -2588,8 +2592,6 @@ jumbo_split_static_library("browser") {
+       "banners/app_banner_infobar_delegate_desktop.h",
+       "banners/app_banner_manager_desktop.cc",
+       "banners/app_banner_manager_desktop.h",
+-      "bookmarks/bookmark_html_writer.cc",
+-      "bookmarks/bookmark_html_writer.h",
+       "certificate_viewer.h",
+       "chrome_browser_field_trials_desktop.cc",
+       "chrome_browser_field_trials_desktop.h",
+@@ -2678,8 +2680,6 @@ jumbo_split_static_library("browser") {
+       "importer/importer_uma.h",
+       "importer/in_process_importer_bridge.cc",
+       "importer/in_process_importer_bridge.h",
+-      "importer/profile_writer.cc",
+-      "importer/profile_writer.h",
+       "lifetime/browser_close_manager.cc",
+       "lifetime/browser_close_manager.h",
+       "lifetime/termination_notification.cc",
+diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
+--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
++++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
+@@ -9,18 +9,29 @@
+ 
+ #include <memory>
+ 
++#include "base/android/content_uri_utils.h"
+ #include "base/android/jni_array.h"
+ #include "base/android/jni_string.h"
++#include "base/android/path_utils.h"
+ #include "base/containers/stack.h"
+ #include "base/containers/stack_container.h"
+ #include "base/i18n/string_compare.h"
++#include "base/strings/utf_string_conversions.h"
++#include "chrome/utility/importer/bookmark_html_reader.h"
++#include "chrome/browser/bookmarks/bookmark_html_writer.h"
+ #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+ #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
++#include "chrome/browser/importer/profile_writer.h"
++#include "chrome/browser/platform_util.h"
++#include "chrome/browser/ui/chrome_select_file_policy.h"
+ #include "chrome/browser/profiles/incognito_helpers.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/profiles/profile_android.h"
+ #include "chrome/browser/signin/signin_manager_factory.h"
+ #include "chrome/browser/undo/bookmark_undo_service_factory.h"
++#include "chrome/common/importer/imported_bookmark_entry.h"
++#include "chrome/common/importer/importer_data_types.h"
++#include "chrome/common/url_constants.h"
+ #include "components/bookmarks/browser/bookmark_model.h"
+ #include "components/bookmarks/browser/bookmark_utils.h"
+ #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
+@@ -30,11 +41,14 @@
+ #include "components/bookmarks/managed/managed_bookmark_service.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/query_parser/query_parser.h"
++#include "components/search_engines/template_url.h"
+ #include "components/signin/core/browser/signin_manager.h"
+ #include "components/undo/bookmark_undo_service.h"
+ #include "components/undo/undo_manager.h"
++#include "components/url_formatter/url_fixer.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "jni/BookmarkBridge_jni.h"
++#include "ui/android/window_android.h"
+ 
+ using base::android::AttachCurrentThread;
+ using base::android::ConvertUTF8ToJavaString;
+@@ -53,6 +67,57 @@ using bookmarks::BookmarkPermanentNode;
+ using bookmarks::BookmarkType;
+ using content::BrowserThread;
+ 
++namespace internal {
++
++// Returns true if |url| has a valid scheme that we allow to import. We
++// filter out the URL with a unsupported scheme.
++bool CanImportURL(const GURL& url) {
++  // The URL is not valid.
++  if (!url.is_valid())
++    return false;
++
++  // Filter out the URLs with unsupported schemes.
++  const char* const kInvalidSchemes[] = {"wyciwyg", "place"};
++  for (size_t i = 0; i < arraysize(kInvalidSchemes); ++i) {
++    if (url.SchemeIs(kInvalidSchemes[i]))
++      return false;
++  }
++
++  // Check if |url| is about:blank.
++  if (url == url::kAboutBlankURL)
++    return true;
++
++  // If |url| starts with chrome:// or about:, check if it's one of the URLs
++  // that we support.
++  if (url.SchemeIs(content::kChromeUIScheme) ||
++      url.SchemeIs(url::kAboutScheme)) {
++    if (url.host_piece() == chrome::kChromeUIUberHost ||
++        url.host_piece() == chrome::kChromeUIAboutHost)
++      return true;
++
++    GURL fixed_url(url_formatter::FixupURL(url.spec(), std::string()));
++    for (size_t i = 0; i < chrome::kNumberOfChromeHostURLs; ++i) {
++      if (fixed_url.DomainIs(chrome::kChromeHostURLs[i]))
++        return true;
++    }
++
++    for (size_t i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) {
++      if (fixed_url == chrome::kChromeDebugURLs[i])
++        return true;
++    }
++
++    // If url has either chrome:// or about: schemes but wasn't found in the
++    // above lists, it means we don't support it, so we don't allow the user
++    // to import it.
++    return false;
++  }
++
++  // Otherwise, we assume the url has a valid (importable) scheme.
++  return true;
++}
++
++} // internal
++
+ namespace {
+ 
+ class BookmarkTitleComparer {
+@@ -129,6 +194,10 @@ BookmarkBridge::~BookmarkBridge() {
+   bookmark_model_->RemoveObserver(this);
+   if (partner_bookmarks_shim_)
+     partner_bookmarks_shim_->RemoveObserver(this);
++  // There may be pending file dialogs, we need to tell them that we've gone
++  // away so they don't try and call back to us.
++  if (select_file_dialog_)
++    select_file_dialog_->ListenerDestroyed();
+ }
+ 
+ void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
+@@ -470,6 +539,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+   return count;
+ }
+ 
++void BookmarkBridge::ImportBookmarks(JNIEnv* env,
++                                       const JavaParamRef<jobject>& obj,
++                                       const JavaParamRef<jobject>& java_window) {
++  DCHECK(IsLoaded());
++  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
++
++  ui::WindowAndroid* window =
++      ui::WindowAndroid::FromJavaWindowAndroid(java_window);
++  CHECK(window);
++
++  select_file_dialog_ = ui::SelectFileDialog::Create(
++    this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
++
++  //NOTE: extension and description are not used on Android
++  ui::SelectFileDialog::FileTypeInfo file_type_info;
++  file_type_info.extensions.resize(1);
++  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
++  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
++  file_type_info.extension_description_overrides.push_back(base::ASCIIToUTF16("Netscape Bookmark"));
++  file_type_info.allowed_paths =
++      ui::SelectFileDialog::FileTypeInfo::NATIVE_OR_DRIVE_PATH;
++
++  select_file_dialog_->SelectFile(
++        ui::SelectFileDialog::SELECT_OPEN_FILE,
++        base::string16(),
++        import_path_,
++        &file_type_info,
++        0,
++        base::FilePath::StringType(),
++        window,
++        NULL);
++
++  //NOTE: this should be called after the actual import
++  Java_BookmarkBridge_bookmarksImported(env, obj);
++}
++
++void BookmarkBridge::ExportBookmarks(JNIEnv* env,
++                                       const JavaParamRef<jobject>& obj) {
++  DCHECK(IsLoaded());
++  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
++
++  if (import_path_.empty()) {
++    if (!base::android::GetDownloadsDirectory(&import_path_)) {
++      LOG(ERROR) << "Could not retrieve downloads directory for bookmarks export";
++      return;
++    }
++    import_path_ = import_path_.Append(FILE_PATH_LITERAL("bookmarks.html"));
++  }
++
++  bookmark_html_writer::WriteBookmarks(profile_, import_path_, NULL);
++
++  //NOTE: nothing will be written if write permission has not been granted before
++  LOG(INFO) << "Bookmarks exported successfully in " << import_path_;
++
++  Java_BookmarkBridge_bookmarksExported(env, obj, ConvertUTF8ToJavaString(env, import_path_.MaybeAsASCII()));
++}
++
++// Attempts to create a TemplateURL from the provided data. |title| is optional.
++// If TemplateURL creation fails, returns null.
++std::unique_ptr<TemplateURL> CreateTemplateURL(const base::string16& url,
++                                               const base::string16& keyword,
++                                               const base::string16& title) {
++  if (url.empty() || keyword.empty())
++    return nullptr;
++  TemplateURLData data;
++  data.SetKeyword(keyword);
++  // We set short name by using the title if it exists.
++  // Otherwise, we use the shortcut.
++  data.SetShortName(title.empty() ? keyword : title);
++  data.SetURL(TemplateURLRef::DisplayURLToURLRef(url));
++  return std::make_unique<TemplateURL>(data);
++}
++
++void BookmarkBridge::FileSelected(const base::FilePath& path, int index,
++                            void* params) {
++  base::File file;
++  if (path.IsContentUri()) {
++    file = base::OpenContentUriForRead(path);
++  } else {
++    file.Initialize(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
++  }
++  if (!file.IsValid()) {
++    LOG(ERROR) << "Cannot open bookmarks file for import";
++    return;
++  }
++
++  auto fileLength = file.GetLength();
++  if (-1 == fileLength) {
++    LOG(ERROR) << "Cannot read bookmarks file length";
++    return;
++  }
++
++  if (fileLength > 10 * 1024 * 1024) {
++    LOG(ERROR) << "Bookmarks file is too big";
++    return;
++  }
++
++  std::vector<char> buffer(fileLength);
++  if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) {
++    LOG(ERROR) << "Could not read bookmarks file";
++    return;
++  }
++
++  if (buffer.empty()) {
++    LOG(ERROR) << "Empty bookmarks file";
++    return;
++  }
++
++  std::string contents(buffer.begin(), buffer.end());
++
++  // the following import logic comes from BookmarksFileImporter class
++  std::vector<ImportedBookmarkEntry> bookmarks;
++  std::vector<importer::SearchEngineInfo> search_engines;
++
++  bookmark_html_reader::ImportBookmarksFile(
++      base::Callback<bool(void)>(),
++      base::Bind(internal::CanImportURL),
++      contents,
++      &bookmarks,
++      &search_engines,
++      nullptr);
++
++  // writing to profile will begin extensive changes and use the same bookmarks model for persisting changes
++  auto *writer = new ProfileWriter(profile_);
++
++  if (!bookmarks.empty()) {
++    writer->AddBookmarks(bookmarks, base::ASCIIToUTF16("Imported"));
++  }
++  if (!search_engines.empty()) {
++    TemplateURLService::OwnedTemplateURLVector owned_template_urls;
++    for (const auto& search_engine : search_engines) {
++      std::unique_ptr<TemplateURL> owned_template_url = CreateTemplateURL(
++          search_engine.url, search_engine.keyword, search_engine.display_name);
++      if (owned_template_url)
++        owned_template_urls.push_back(std::move(owned_template_url));
++    }
++    writer->AddKeywords(std::move(owned_template_urls), false);
++  }
++
++  LOG(INFO) << "Imported " << bookmarks.size() << " bookmarks and " <<
++		search_engines.size() << " search engines from " << import_path_;
++}
++
++void BookmarkBridge::FileSelectionCanceled(void* params) {
++}
++
+ void BookmarkBridge::SetBookmarkTitle(JNIEnv* env,
+                                        const JavaParamRef<jobject>& obj,
+                                        jlong id,
+diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h
+--- a/chrome/browser/android/bookmarks/bookmark_bridge.h
++++ b/chrome/browser/android/bookmarks/bookmark_bridge.h
+@@ -13,6 +13,8 @@
+ #include "components/bookmarks/browser/base_bookmark_model_observer.h"
+ #include "components/bookmarks/common/android/bookmark_id.h"
+ #include "components/prefs/pref_change_registrar.h"
++#include "components/search_engines/template_url.h"
++#include "ui/shell_dialogs/select_file_dialog.h"
+ 
+ namespace bookmarks {
+ class BookmarkModel;
+@@ -26,7 +28,8 @@ class Profile;
+ // bookmark page. This fetches the bookmarks, title, urls, folder
+ // hierarchy.
+ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+-                        public PartnerBookmarksShim::Observer {
++                        public PartnerBookmarksShim::Observer,
++                        public ui::SelectFileDialog::Listener {
+  public:
+   BookmarkBridge(JNIEnv* env,
+                  const base::android::JavaRef<jobject>& obj,
+@@ -36,6 +39,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+   bool IsDoingExtensiveChanges(JNIEnv* env,
+                                const base::android::JavaParamRef<jobject>& obj);
+ 
++  // SelectFileDialog::Listener implementation.
++  void FileSelected(const base::FilePath& path,
++                    int index,
++                    void* params) override;
++  void FileSelectionCanceled(void* params) override;
++
+   jboolean IsEditBookmarksEnabled(
+       JNIEnv* env,
+       const base::android::JavaParamRef<jobject>& obj);
+@@ -116,6 +125,13 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+                              jlong id,
+                              jint type);
+ 
++  void ImportBookmarks(JNIEnv* env,
++                        const base::android::JavaParamRef<jobject>& obj,
++                        const base::android::JavaParamRef<jobject>& java_window);
++
++  void ExportBookmarks(JNIEnv* env,
++                        const base::android::JavaParamRef<jobject>& obj);
++
+   void SetBookmarkTitle(JNIEnv* env,
+                         const base::android::JavaParamRef<jobject>& obj,
+                         jlong id,
+@@ -261,12 +277,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+   void ShimBeingDeleted(PartnerBookmarksShim* shim) override;
+ 
+   Profile* profile_;
++  base::FilePath import_path_;
+   JavaObjectWeakGlobalRef weak_java_ref_;
+   bookmarks::BookmarkModel* bookmark_model_;  // weak
+   bookmarks::ManagedBookmarkService* managed_bookmark_service_;  // weak
+   std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
+       grouped_bookmark_actions_;
+   PrefChangeRegistrar pref_change_registrar_;
++  scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
+ 
+   // Information about the Partner bookmarks (must check for IsLoaded()).
+   // This is owned by profile.
+diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
+--- a/chrome/browser/importer/profile_writer.cc
++++ b/chrome/browser/importer/profile_writer.cc
+@@ -97,12 +97,14 @@ void ProfileWriter::AddHistoryPage(const history::URLRows& page,
+     HistoryServiceFactory::GetForProfile(profile_,
+                                          ServiceAccessType::EXPLICIT_ACCESS)
+         ->AddPagesWithDetails(page, visit_source);
++#if !defined(OS_ANDROID)
+   // Measure the size of the history page after Auto Import on first run.
+   if (first_run::IsChromeFirstRun() &&
+       visit_source == history::SOURCE_IE_IMPORTED) {
+     UMA_HISTOGRAM_COUNTS_1M("Import.ImportedHistorySize.AutoImportFromIE",
+                             page.size());
+   }
++#endif
+ }
+ 
+ void ProfileWriter::AddHomepage(const GURL& home_page) {
+diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
+--- a/chrome/common/BUILD.gn
++++ b/chrome/common/BUILD.gn
+@@ -442,6 +442,9 @@ static_library("common") {
+     sources += [
+       "media/chrome_media_drm_bridge_client.cc",
+       "media/chrome_media_drm_bridge_client.h",
++      ## Bromite dependencies for bookmark import functionality
++      "importer/imported_bookmark_entry.cc",
++      "importer/imported_bookmark_entry.h",
+     ]
+   } else {
+     # Non-Android.
+diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
+--- a/chrome/utility/BUILD.gn
++++ b/chrome/utility/BUILD.gn
+@@ -58,8 +58,6 @@ static_library("utility") {
+ 
+   if (!is_android) {
+     sources += [
+-      "importer/bookmark_html_reader.cc",
+-      "importer/bookmark_html_reader.h",
+       "importer/bookmarks_file_importer.cc",
+       "importer/bookmarks_file_importer.h",
+       "importer/edge_database_reader_win.cc",
+@@ -162,6 +160,11 @@ static_library("utility") {
+     ]
+   }
+ 
++  sources += [
++    "importer/bookmark_html_reader.cc",
++    "importer/bookmark_html_reader.h",
++  ]
++
+   if (use_nss_certs) {
+     sources += [
+       "importer/nss_decryptor_system_nss.cc",
+diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
+--- a/chrome/utility/importer/bookmark_html_reader.cc
++++ b/chrome/utility/importer/bookmark_html_reader.cc
+@@ -17,7 +17,9 @@
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/time/time.h"
+ #include "chrome/common/importer/imported_bookmark_entry.h"
++#if !defined(OS_ANDROID)
+ #include "chrome/utility/importer/favicon_reencode.h"
++#endif
+ #include "components/search_engines/search_terms_data.h"
+ #include "components/search_engines/template_url.h"
+ #include "net/base/data_url.h"
+@@ -56,6 +58,7 @@ bool GetAttribute(const std::string& attribute_list,
+   return true;
+ }
+ 
++#if !defined(OS_ANDROID)
+ // Given the URL of a page and a favicon data URL, adds an appropriate record
+ // to the given favicon usage vector.
+ void DataURLToFaviconUsage(const GURL& link_url,
+@@ -86,6 +89,7 @@ void DataURLToFaviconUsage(const GURL& link_url,
+ 
+   favicons->push_back(usage);
+ }
++#endif
+ 
+ }  // namespace
+ 
+@@ -108,12 +112,10 @@ static std::string stripDt(const std::string& lineDt) {
+ void ImportBookmarksFile(
+     const base::Callback<bool(void)>& cancellation_callback,
+     const base::Callback<bool(const GURL&)>& valid_url_callback,
+-    const base::FilePath& file_path,
++    const std::string& content,
+     std::vector<ImportedBookmarkEntry>* bookmarks,
+     std::vector<importer::SearchEngineInfo>* search_engines,
+     favicon_base::FaviconUsageDataList* favicons) {
+-  std::string content;
+-  base::ReadFileToString(file_path, &content);
+   std::vector<std::string> lines = base::SplitString(
+       content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+ 
+@@ -126,6 +128,7 @@ void ImportBookmarksFile(
+   std::vector<base::string16> path;
+   size_t toolbar_folder_index = 0;
+   std::string charset = "UTF-8";  // If no charset is specified, assume utf-8.
++
+   for (size_t i = 0;
+        i < lines.size() &&
+            (cancellation_callback.is_null() || !cancellation_callback.Run());
+@@ -218,10 +221,12 @@ void ImportBookmarksFile(
+       }
+       bookmarks->push_back(entry);
+ 
++#if !defined(OS_ANDROID)
+       // Save the favicon. DataURLToFaviconUsage will handle the case where
+       // there is no favicon.
+       if (favicons)
+         DataURLToFaviconUsage(url, favicon, favicons);
++#endif
+ 
+       continue;
+     }
+@@ -278,6 +283,22 @@ void ImportBookmarksFile(
+   }
+ }
+ 
++void ImportBookmarksFile(
++    const base::Callback<bool(void)>& cancellation_callback,
++    const base::Callback<bool(const GURL&)>& valid_url_callback,
++    const base::FilePath& file_path,
++    std::vector<ImportedBookmarkEntry>* bookmarks,
++    std::vector<importer::SearchEngineInfo>* search_engines,
++    favicon_base::FaviconUsageDataList* favicons) {
++  std::string content;
++  if (!base::ReadFileToString(file_path, &content)) {
++     LOG(ERROR) << "Could not directly read bookmarks import file";
++     return;
++  }
++
++  ImportBookmarksFile(cancellation_callback, valid_url_callback, content, bookmarks, search_engines, favicons);
++}
++
+ bool CanImportURLAsSearchEngine(const GURL& url,
+                                 std::string* search_engine_url) {
+   std::string url_spec = url.possibly_invalid_spec();
+diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/importer/bookmark_html_reader.h
+--- a/chrome/utility/importer/bookmark_html_reader.h
++++ b/chrome/utility/importer/bookmark_html_reader.h
+@@ -51,6 +51,15 @@ void ImportBookmarksFile(
+     std::vector<importer::SearchEngineInfo>* search_engines,
+     favicon_base::FaviconUsageDataList* favicons);
+ 
++void ImportBookmarksFile(
++    const base::Callback<bool(void)>& cancellation_callback,
++    const base::Callback<bool(const GURL&)>& valid_url_callback,
++    const std::string& content,
++    std::vector<ImportedBookmarkEntry>* bookmarks,
++    std::vector<importer::SearchEngineInfo>* search_engines,
++    favicon_base::FaviconUsageDataList* favicons);
++
++
+ // Returns true if |url| should be imported as a search engine, i.e. because it
+ // has replacement terms. Chrome treats such bookmarks as search engines rather
+ // than true bookmarks.
+-- 
+2.11.0
+

build/patches/Add-custom-tab-intents-privacy-option.patch

@@ -0,0 +1,113 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 29 Aug 2018 11:03:44 +0200
+Subject: Add custom tab intents privacy option
+
+---
+ chrome/android/java/res/values/values.xml                      |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml            |  5 +++++
+ .../org/chromium/chrome/browser/LaunchIntentDispatcher.java    |  2 ++
+ .../chrome/browser/preferences/privacy/PrivacyPreferences.java | 10 ++++++++++
+ chrome/android/java/strings/android_chrome_strings.grd         |  7 +++++++
+ 5 files changed, 27 insertions(+)
+
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
++++ b/chrome/android/java/res/values/values.xml
+@@ -18,6 +18,9 @@
+     <item name="top_controls_show_threshold" format="float" type="dimen">0.5</item>
+     <item name="top_controls_hide_threshold" format="float" type="dimen">0.5</item>
+ 
++    <string name="allow_custom_tab_intents_title">Allow custom tab intents from applications</string>
++    <string name="allow_custom_tab_intents_summary">When disabled, all custom tab intents will be processed as regular navigation instead</string>
++
+     <!-- The number of thumbnails that the thumbnail cache can hold. -->
+     <integer name="default_thumbnail_cache_size">5</integer>
+     <!-- The number of approximation thumbnails that the approximation cache can hold. -->
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -43,6 +43,11 @@
+         android:title="@string/clear_browsing_data_title"
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
++        android:key="allow_custom_tab_intents"
++        android:title="@string/allow_custom_tab_intents_title"
++        android:summary="@string/allow_custom_tab_intents_summary"
++        android:defaultValue="false" />
+     <Preference
+         android:key="sync_and_services_link_divider"
+         android:layout="@layout/divider_preference"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
+ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
+ import org.chromium.chrome.browser.profiles.Profile;
++import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;
+ import org.chromium.chrome.browser.searchwidget.SearchActivity;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
+@@ -272,6 +273,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+      */
+     public static boolean isCustomTabIntent(Intent intent) {
+         if (intent == null) return false;
++        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false)) return false;
+         if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
+                 || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
+             return false;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+@@ -38,6 +38,7 @@ public class PrivacyPreferences extends PreferenceFragment
+         implements OnPreferenceChangeListener {
+     private static final String PREF_NAVIGATION_ERROR = "navigation_error";
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
++    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
+     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
+@@ -101,6 +102,11 @@ public class PrivacyPreferences extends PreferenceFragment
+         navigationErrorPref.setOnPreferenceChangeListener(this);
+         navigationErrorPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+ 
++        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
++        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
++        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
++
+         ChromeBaseCheckBoxPreference searchSuggestionsPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
+         searchSuggestionsPref.setOnPreferenceChangeListener(this);
+@@ -123,6 +129,10 @@ public class PrivacyPreferences extends PreferenceFragment
+             recordNetworkPredictionEnablingUMA((boolean) newValue);
+         } else if (PREF_NAVIGATION_ERROR.equals(key)) {
+             PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
++        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
++            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
++            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
++            sharedPreferencesEditor.apply();
+         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -3875,6 +3875,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
+         Browse
+       </message>
+ 
++      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
++        Allow custom tab intents
++      </message>
++      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
++        Allow applications to open custom tab intents, similar to webview.
++      </message>
++
+       <!-- Migration strings -->
+       <message name="IDS_UPDATING_CHROME" desc="String that indicates that Chrome is updating">
+         Updating Chrome...
+-- 
+2.11.0
+

build/patches/Add-exit-menu-item.patch

@@ -1,17 +1,19 @@
 From: Serg <serg.zhukovsky@gmail.com>
 Date: Tue, 31 Jan 2017 22:12:27 -0500
-Subject: Added exit menu item
+Subject: Add exit menu item
 
+Corrected Exit functionality
 ---
- chrome/android/java/res/menu/main_menu.xml                             | 2 ++
- .../android/java/src/org/chromium/chrome/browser/ChromeActivity.java   | 2 ++
- chrome/android/java/strings/android_chrome_strings.grd                 | 3 +++
- 3 files changed, 7 insertions(+)
+ chrome/android/java/res/menu/main_menu.xml                          | 2 ++
+ .../java/src/org/chromium/chrome/browser/ChromeActivity.java        | 2 ++
+ .../org/chromium/chrome/browser/init/ChromeLifetimeController.java  | 6 +++++-
+ chrome/android/java/strings/android_chrome_strings.grd              | 3 +++
+ 4 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -78,6 +78,8 @@
+@@ -80,6 +80,8 @@
              android:title="@string/menu_help" />
          <item android:id="@+id/enter_vr_id"
              android:title="@string/enter_vr" />
@@ -23,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -1951,6 +1951,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2100,6 +2100,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              RecordUserAction.record("MobileMenuSettings");
          } else if (id == R.id.show_menu) {
              showAppMenuForKeyboardEvent();
@@ -32,10 +34,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
          } else if (id == R.id.find_in_page_id) {
              if (mFindToolbarManager == null) return false;
  
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
+@@ -87,7 +87,11 @@ class ChromeLifetimeController implements ApplicationLifetime.Observer,
+ 
+         // Kick off a timer to kill the process after a delay, which fires only if the Activities
+         // take too long to be finished.
+-        mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
++        if (restart) {
++            mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
++        } else {
++            fireBrowserRestartActivityIntent();
++        }
+     }
+ 
+     @Override
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2563,6 +2563,9 @@ Google may use your browsing activity, content on some sites you visit, and othe
+@@ -2992,6 +2992,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
          Settings
        </message>
@@ -46,5 +64,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
          Close all tabs
        </message>
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-flag-to-configure-maximum-connections-per-host.patch

@@ -0,0 +1,155 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 8 Jul 2018 22:42:04 +0200
+Subject: Add flag to configure maximum connections per host
+
+With the introduction of this flag it is possible to increase the maximum
+allowed connections per host; this can however be detrimental to devices
+with limited CPU/memory resources and it is disabled by default.
+---
+ chrome/browser/about_flags.cc                            |  8 ++++++++
+ chrome/browser/flag_descriptions.cc                      |  4 ++++
+ chrome/browser/flag_descriptions.h                       |  3 +++
+ .../common/network_features.cc                           |  3 +++
+ .../common/network_features.h                            |  4 ++++
+ .../common/network_switch_list.h                         |  4 ++++
+ net/socket/client_socket_pool_manager.cc                 | 16 ++++++++++++++++
+ 7 files changed, 42 insertions(+)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -964,6 +964,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+      net::kEffectiveConnectionType4G},
+ };
+ 
++const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
++    {features::kMaxConnectionsPerHostChoiceDefault, "", ""},
++    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
++};
++
+ // Ensure that all effective connection types returned by Network Quality
+ // Estimator (NQE) are also exposed via flags.
+ static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
+@@ -2607,6 +2612,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kMaterialDesignIncognitoNTPName,
+      flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
++    {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName,
++     flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll,
++     MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
+     {"safe-search-url-reporting",
+      flag_descriptions::kSafeSearchUrlReportingName,
+      flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -1142,6 +1142,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
+     "If enabled, the Incognito New Tab page uses the new material design with "
+     "a better readable text.";
+ 
++const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
++const char kMaxConnectionsPerHostDescription[] =
++     "Customize maximum allowed connections per host.";
++
+ const char kMediaRouterCastAllowAllIPsName[] =
+     "Connect to Cast devices on all IP addresses";
+ const char kMediaRouterCastAllowAllIPsDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -710,6 +710,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
+ extern const char kMaterialDesignIncognitoNTPName[];
+ extern const char kMaterialDesignIncognitoNTPDescription[];
+ 
++extern const char kMaxConnectionsPerHostName[];
++extern const char kMaxConnectionsPerHostDescription[];
++
+ extern const char kMediaRouterCastAllowAllIPsName[];
+ extern const char kMediaRouterCastAllowAllIPsDescription[];
+ 
+diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
+--- a/components/network_session_configurator/common/network_features.cc
++++ b/components/network_session_configurator/common/network_features.cc
+@@ -8,6 +8,9 @@
+ 
+ namespace features {
+ 
++const char kMaxConnectionsPerHostChoiceDefault[] = "6",
++                 kMaxConnectionsPerHostChoice15[] = "15";
++
+ const base::Feature kChannelID{"channel-id", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const char kDnsOverHttpsChoiceDefault[] = "Disabled",
+diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
+--- a/components/network_session_configurator/common/network_features.h
++++ b/components/network_session_configurator/common/network_features.h
+@@ -10,6 +10,10 @@
+ 
+ namespace features {
+ 
++NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kMaxConnectionsPerHostChoiceDefault[],
++                 kMaxConnectionsPerHostChoice6[],
++                 kMaxConnectionsPerHostChoice15[];
++
+ // Enables Channel ID.
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
+ 
+diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
+--- a/components/network_session_configurator/common/network_switch_list.h
++++ b/components/network_session_configurator/common/network_switch_list.h
+@@ -21,6 +21,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
+ // Enables the QUIC protocol.  This is a temporary testing flag.
+ NETWORK_SWITCH(kEnableQuic, "enable-quic")
+ 
++// Allows specifying a higher number of maximum connections per host
++// (15 instead of 6, mirroring the value Mozilla uses).
++NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host")
++
+ // Enable use of experimental TCP sockets API for sending data in the
+ // SYN packet.
+ NETWORK_SWITCH(kEnableTcpFastOpen, "enable-tcp-fastopen")
+diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
+--- a/net/socket/client_socket_pool_manager.cc
++++ b/net/socket/client_socket_pool_manager.cc
+@@ -6,8 +6,10 @@
+ 
+ #include <memory>
+ 
++#include "base/command_line.h"
+ #include "base/logging.h"
+ #include "base/strings/stringprintf.h"
++#include "base/strings/string_number_conversions.h"
+ #include "net/base/load_flags.h"
+ #include "net/http/http_proxy_client_socket_pool.h"
+ #include "net/http/http_request_info.h"
+@@ -19,6 +21,7 @@
+ #include "net/socket/ssl_client_socket_pool.h"
+ #include "net/socket/transport_client_socket_pool.h"
+ #include "net/ssl/ssl_config.h"
++#include "components/network_session_configurator/common/network_switches.h"
+ 
+ namespace net {
+ 
+@@ -316,6 +319,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+ int ClientSocketPoolManager::max_sockets_per_group(
+     HttpNetworkSession::SocketPoolType pool_type) {
+   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
++
++  if (pool_type == HttpNetworkSession::NORMAL_SOCKET_POOL) {
++      int maxConnectionsPerHost = 0;
++      auto value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kMaxConnectionsPerHost);
++      if (!value.empty() && !base::StringToInt(value, &maxConnectionsPerHost)) {
++        LOG(DFATAL) << "--" << switches::kMaxConnectionsPerHost << " only accepts integers as arguments (\"" << value << "\" is invalid)";
++      }
++      if (maxConnectionsPerHost != 0) {
++        return maxConnectionsPerHost;
++      }
++      // fallthrough for default value
++  }
++
+   return g_max_sockets_per_group[pool_type];
+ }
+ 
+-- 
+2.11.0
+

build/patches/Add-flag-to-control-video-playback-resume-feature.patch

@@ -0,0 +1,74 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 25 Oct 2018 23:13:34 +0200
+Subject: Add flag to control video playback resume feature
+
+Disable it by default on Android as it is everywhere else
+---
+ chrome/browser/about_flags.cc       | 5 +++++
+ chrome/browser/flag_descriptions.cc | 5 +++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ media/base/media_switches.cc        | 6 +-----
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -3439,6 +3439,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)},
+ #endif  // !defined(OS_ANDROID)
+ 
++    {"resume-background-video",
++     flag_descriptions::kResumeBackgroundVideoName,
++     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
++     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
++
+ #if defined(OS_MACOSX)
+     {"mac-rtl", flag_descriptions::kMacRTLName,
+      flag_descriptions::kMacRTLDescription, kOsMac,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -759,6 +759,11 @@ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture.";
+ const char kEnablePictureInPictureDescription[] =
+     "Enable the Picture-in-Picture feature for videos.";
+ 
++const char kResumeBackgroundVideoName[] = "Resume background video.";
++const char kResumeBackgroundVideoDescription[] =
++    "Resume background video playback when tab re-gains focus; additionally, "
++    "it will pause video playback every single time you switch tabs.";
++
+ const char kEnablePixelCanvasRecordingName[] = "Enable pixel canvas recording";
+ const char kEnablePixelCanvasRecordingDescription[] =
+     "Pixel canvas recording allows the compositor to raster contents aligned "
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -470,6 +470,9 @@ extern const char kOOPHPStackModePseudo[];
+ extern const char kEnablePictureInPictureName[];
+ extern const char kEnablePictureInPictureDescription[];
+ 
++extern const char kResumeBackgroundVideoName[];
++extern const char kResumeBackgroundVideoDescription[];
++
+ extern const char kEnablePixelCanvasRecordingName[];
+ extern const char kEnablePixelCanvasRecordingDescription[];
+ 
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+--- a/media/base/media_switches.cc
++++ b/media/base/media_switches.cc
+@@ -221,11 +221,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+ // when in background.
+ const base::Feature kResumeBackgroundVideo {
+   "resume-background-video",
+-#if defined(OS_ANDROID)
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+-      base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
++   base::FEATURE_DISABLED_BY_DEFAULT
+ };
+ 
+ // Display the Cast overlay button on the media controls.
+-- 
+2.11.0
+

build/patches/Add-flag-to-disable-IPv6-probes.patch

@@ -0,0 +1,110 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 18 Nov 2018 13:06:49 +0100
+Subject: Add flag to disable IPv6 probes
+
+---
+ chrome/browser/about_flags.cc           |  5 +++++
+ chrome/browser/flag_descriptions.cc     |  4 ++++
+ chrome/browser/flag_descriptions.h      |  3 +++
+ net/dns/host_resolver_impl.cc           | 10 ++++++++--
+ services/network/public/cpp/features.cc |  3 +++
+ services/network/public/cpp/features.h  |  2 ++
+ 6 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -3499,6 +3499,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kEnableVirtualKeyboardUkm)},
+ #endif  // OS_CHROMEOS
+ 
++    {"ipv6-probing",
++     flag_descriptions::kIPv6ProbingName,
++     flag_descriptions::kIPv6ProbingDescription, kOsAll,
++     FEATURE_VALUE_TYPE(network::features::kIPv6Probing)},
++
+ #if !defined(OS_ANDROID)
+     {"enable-picture-in-picture",
+      flag_descriptions::kEnablePictureInPictureName,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -763,6 +763,10 @@ const char kOOPHPStackModeNative[] = "Native";
+ const char kOOPHPStackModeNativeWithThreadNames[] = "Native with thread names";
+ const char kOOPHPStackModePseudo[] = "Trace events";
+ 
++const char kIPv6ProbingName[] = "Enable IPv6 probing.";
++const char kIPv6ProbingDescription[] =
++    "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
++
+ const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture.";
+ const char kEnablePictureInPictureDescription[] =
+     "Enable the Picture-in-Picture feature for videos.";
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -473,6 +473,9 @@ extern const char kOOPHPStackModeNative[];
+ extern const char kOOPHPStackModeNativeWithThreadNames[];
+ extern const char kOOPHPStackModePseudo[];
+ 
++extern const char kIPv6ProbingName[];
++extern const char kIPv6ProbingDescription[];
++
+ extern const char kEnablePictureInPictureName[];
+ extern const char kEnablePictureInPictureDescription[];
+ 
+diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
+--- a/net/dns/host_resolver_impl.cc
++++ b/net/dns/host_resolver_impl.cc
+@@ -76,6 +76,7 @@
+ #include "net/log/net_log_with_source.h"
+ #include "net/socket/client_socket_factory.h"
+ #include "net/socket/datagram_client_socket.h"
++#include "services/network/public/cpp/features.h"
+ #include "url/url_canon_ip.h"
+ 
+ #if BUILDFLAG(ENABLE_MDNS)
+@@ -2719,8 +2720,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) {
+   bool cached = true;
+   if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
+       kIPv6ProbePeriodMs) {
+-    last_ipv6_probe_result_ =
+-        IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log);
++    if (!base::FeatureList::IsEnabled(network::features::kIPv6Probing)) {
++      // pretend IPv6 connectivy probe is successful when probing is disabled
++      last_ipv6_probe_result_ = true;
++    } else {
++      last_ipv6_probe_result_ =
++          IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log);
++    }
+     last_ipv6_probe_time_ = tick_clock_->NowTicks();
+     cached = false;
+   }
+diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
+--- a/services/network/public/cpp/features.cc
++++ b/services/network/public/cpp/features.cc
+@@ -14,6 +14,9 @@ const base::Feature kExpectCTReporting{"ExpectCTReporting",
+ 
+ const base::Feature kNetworkErrorLogging{"NetworkErrorLogging",
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
++
++const base::Feature kIPv6Probing{"IPv6Probing",
++                                       base::FEATURE_DISABLED_BY_DEFAULT};
+ // Enables the network service.
+ const base::Feature kNetworkService{"NetworkService",
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
+--- a/services/network/public/cpp/features.h
++++ b/services/network/public/cpp/features.h
+@@ -18,6 +18,8 @@ extern const base::Feature kNetworkErrorLogging;
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kNetworkService;
+ COMPONENT_EXPORT(NETWORK_CPP)
++extern const base::Feature kIPv6Probing;
++COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kOutOfBlinkCORS;
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kReporting;
+-- 
+2.11.0
+

build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch

@@ -0,0 +1,184 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 22 Oct 2018 21:29:53 +0200
+Subject: Add flags to disable device motion and orientation APIs
+
+Both flags will be disabled by default and prevent usage of gyroscope and
+legacy acceleration events.
+---
+ chrome/browser/about_flags.cc                                  |  6 ++++++
+ chrome/browser/flag_descriptions.cc                            |  8 ++++++++
+ chrome/browser/flag_descriptions.h                             |  6 ++++++
+ content/child/runtime_features.cc                              |  3 +++
+ content/public/common/content_features.cc                      | 10 ++++++++++
+ content/public/common/content_features.h                       |  2 ++
+ third_party/blink/public/platform/web_runtime_features.h       |  2 ++
+ third_party/blink/renderer/modules/modules_initializer.cc      |  9 ++++++---
+ .../blink/renderer/platform/exported/web_runtime_features.cc   |  8 ++++++++
+ .../blink/renderer/platform/runtime_enabled_features.json5     |  8 ++++++++
+ 10 files changed, 59 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -3005,6 +3005,12 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-generic-sensor", flag_descriptions::kEnableGenericSensorName,
+      flag_descriptions::kEnableGenericSensorDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kGenericSensor)},
++    {"enable-device-motion", flag_descriptions::kEnableDeviceMotionName,
++     flag_descriptions::kEnableDeviceMotionDescription, kOsAll,
++     FEATURE_VALUE_TYPE(features::kDeviceMotion)},
++    {"enable-device-orientation", flag_descriptions::kEnableDeviceOrientationName,
++     flag_descriptions::kEnableDeviceOrientationDescription, kOsAll,
++     FEATURE_VALUE_TYPE(features::kDeviceOrientation)},
+     {"enable-generic-sensor-extra-classes",
+      flag_descriptions::kEnableGenericSensorExtraClassesName,
+      flag_descriptions::kEnableGenericSensorExtraClassesDescription, kOsAll,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -551,6 +551,14 @@ const char kEnableGenericSensorDescription[] =
+     "Accelerometer, LinearAccelerationSensor, Gyroscope, "
+     "AbsoluteOrientationSensor and RelativeOrientationSensor interfaces.";
+ 
++const char kEnableDeviceMotionName[] = "Enable device motion";
++const char kEnableDeviceMotionDescription[] =
++    "Enable device motion API which is used to detect changes in acceleration";
++
++const char kEnableDeviceOrientationName[] = "Enable device orientation";
++const char kEnableDeviceOrientationDescription[] =
++    "Enable device orientation API which is used to detect changes in orientation";
++
+ const char kEnableGenericSensorExtraClassesName[] =
+     "Generic Sensor Extra Classes";
+ const char kEnableGenericSensorExtraClassesDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -362,6 +362,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[];
+ extern const char kEnableGenericSensorName[];
+ extern const char kEnableGenericSensorDescription[];
+ 
++extern const char kEnableDeviceMotionName[];
++extern const char kEnableDeviceMotionDescription[];
++
++extern const char kEnableDeviceOrientationName[];
++extern const char kEnableDeviceOrientationDescription[];
++
+ extern const char kEnableGenericSensorExtraClassesName[];
+ extern const char kEnableGenericSensorExtraClassesDescription[];
+ 
+diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
+--- a/content/child/runtime_features.cc
++++ b/content/child/runtime_features.cc
+@@ -143,6 +143,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
+   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
+     WebRuntimeFeatures::EnableSharedWorker(false);
+ 
++  WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion));
++  WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation));
++
+   if (command_line.HasSwitch(switches::kDisableSpeechAPI))
+     WebRuntimeFeatures::EnableScriptedSpeech(false);
+ 
+diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
+--- a/content/public/common/content_features.cc
++++ b/content/public/common/content_features.cc
+@@ -570,6 +570,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{
+ // https://wicg.github.io/webusb
+ const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
++// Enables the device motion API used to track device acceleration;
++// no user authorization or notifications happens when in use.
++const base::Feature kDeviceMotion{"DeviceMotion",
++                                    base::FEATURE_DISABLED_BY_DEFAULT};
++
++// Enables the device orientation API used to track device orientation;
++// no user authorization or notifications happens when in use.
++const base::Feature kDeviceOrientation{"DeviceOrientation",
++                                    base::FEATURE_DISABLED_BY_DEFAULT};
++
+ // Controls whether WebVR VSync-aligned render loop timing is enabled.
+ const base::Feature kWebVrVsyncAlign{"WebVrVsyncAlign",
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
+diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
+--- a/content/public/common/content_features.h
++++ b/content/public/common/content_features.h
+@@ -152,6 +152,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[];
+ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueSharedBuffer[];
+ #endif  // defined(OS_ANDROID)
+ 
++CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
++
+ #if !defined(OS_ANDROID)
+ CONTENT_EXPORT extern const base::Feature kWebUIPolymer2;
+ #endif  // !defined(OS_ANDROID)
+diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
+--- a/third_party/blink/public/platform/web_runtime_features.h
++++ b/third_party/blink/public/platform/web_runtime_features.h
+@@ -85,6 +85,8 @@ class WebRuntimeFeatures {
+   BLINK_PLATFORM_EXPORT static void EnableCSSFragmentIdentifiers(bool);
+   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
++  BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool);
++  BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDecodeToYUV(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDisplayCutoutAPI(bool);
+   BLINK_PLATFORM_EXPORT static void EnableFastMobileScrolling(bool);
+diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc
+--- a/third_party/blink/renderer/modules/modules_initializer.cc
++++ b/third_party/blink/renderer/modules/modules_initializer.cc
+@@ -233,9 +233,12 @@ void ModulesInitializer::InitInspectorAgentSession(
+ void ModulesInitializer::OnClearWindowObjectInMainWorld(
+     Document& document,
+     const Settings& settings) const {
+-  DeviceMotionController::From(document);
+-  DeviceOrientationController::From(document);
+-  DeviceOrientationAbsoluteController::From(document);
++  if (RuntimeEnabledFeatures::DeviceMotionEnabled())
++    DeviceMotionController::From(document);
++  if (RuntimeEnabledFeatures::DeviceOrientationEnabled()) {
++    DeviceOrientationController::From(document);
++    DeviceOrientationAbsoluteController::From(document);
++  }
+   NavigatorGamepad::From(document);
+   NavigatorServiceWorker::From(document);
+   DOMWindowStorageController::From(document);
+diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
++++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+@@ -136,6 +136,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) {
+   RuntimeEnabledFeatures::SetDatabaseEnabled(enable);
+ }
+ 
++void WebRuntimeFeatures::EnableDeviceMotion(bool enable) {
++  RuntimeEnabledFeatures::SetDeviceMotionEnabled(enable);
++}
++
++void WebRuntimeFeatures::EnableDeviceOrientation(bool enable) {
++  RuntimeEnabledFeatures::SetDeviceOrientationEnabled(enable);
++}
++
+ void WebRuntimeFeatures::EnableDecodeToYUV(bool enable) {
+   RuntimeEnabledFeatures::SetDecodeToYUVEnabled(enable);
+ }
+diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
++++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -357,6 +357,14 @@
+       status: "stable",
+     },
+     {
++      name: "DeviceMotion",
++      status: "stable",
++    },
++    {
++      name: "DeviceOrientation",
++      status: "stable",
++    },
++    {
+       name: "DecodeToYUV",
+       status: "experimental",
+     },
+-- 
+2.11.0
+

build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch

@@ -7,10 +7,10 @@ Subject: Add menu option to toggle global Javascript preference
  chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
  .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
  .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 37 ++++++++++++++++++++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 ++++++++++++++++++++++
  .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
  .../java/strings/android_chrome_strings.grd        | 11 +++++++
- 7 files changed, 91 insertions(+)
+ 7 files changed, 92 insertions(+)
 
 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
@@ -45,7 +45,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -59,6 +59,7 @@
+@@ -61,6 +61,7 @@
              android:title="@string/menu_add_to_homescreen" />
          <item android:id="@+id/open_webapk_id"
              android:title="@string/menu_open_webapk" />
@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/request_desktop_site_row_menu_id"
              android:title="@null">
            <menu>
-@@ -69,6 +70,18 @@
+@@ -71,6 +72,18 @@
                  android:checkable="true" />
            </menu>
          </item>
@@ -75,17 +75,17 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2054,6 +2054,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2195,6 +2195,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
              currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
              RecordUserAction.record("MobileMenuRequestDesktopSite");
 +        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
 +            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
-+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
++            final boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT, !jsEnabled);
 +            if (reloadOnChange) {
-+				currentTab.reload();
-+			}
++                currentTab.reload();
++            }
 +            RecordUserAction.record("MobileMenuRequestEnableJavascript");
          } else if (id == R.id.reader_mode_prefs_id) {
              DomDistillerUIUtils.openSettings(currentTab.getWebContents());
@@ -93,17 +93,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1710,6 +1710,14 @@ public class ChromeTabbedActivity
+@@ -1718,6 +1718,14 @@ public class ChromeTabbedActivity
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
 +        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
 +            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
-+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
++            final boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT, !jsEnabled);
 +            if (reloadOnChange) {
-+				currentTab.reload();
-+			}
++                currentTab.reload();
++            }
 +            RecordUserAction.record("MobileMenuRequestEnableJavascript");
          } else if (id == R.id.open_recently_closed_tab) {
              TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
@@ -111,7 +111,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -214,6 +214,8 @@ public class AppMenuPropertiesDelegate {
+@@ -25,6 +25,7 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeActivity;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.ChromeSwitches;
++import org.chromium.chrome.browser.ContentSettingsType;
+ import org.chromium.chrome.browser.ShortcutHelper;
+ import org.chromium.chrome.browser.UrlConstants;
+ import org.chromium.chrome.browser.banners.AppBannerManager;
+@@ -209,6 +210,8 @@ public class AppMenuPropertiesDelegate {
  
              updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
  
@@ -120,12 +128,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
              // Only display reader mode settings menu option if the current page is in reader mode.
              menu.findItem(R.id.reader_mode_prefs_id)
                      .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
-@@ -469,4 +471,39 @@ public class AppMenuPropertiesDelegate {
- 
-         return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems;
+@@ -448,6 +451,41 @@ public class AppMenuPropertiesDelegate {
      }
-+
-+    /**
+ 
+     /**
 +     * Updates the enable JavaScript item's state.
 +     *
 +     * @param menu {@link Menu} for enable javascript
@@ -148,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +        enableMenuRow.setVisible(itemVisible);
 +        if (!itemVisible) return;
 +
-+        boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
++        boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 +
 +        // Mark the checkbox if Javascript is activated on this tab.
 +        enableMenuCheck.setChecked(jsEnabled);
@@ -159,11 +165,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +                        ? mActivity.getString(R.string.menu_enable_javascript_on)
 +                        : mActivity.getString(R.string.menu_enable_javascript_off));
 +    }
- }
++
++    /**
+      * A notification that the header view has finished inflating.
+      * @param view The view that was inflated.
+      * @param appMenu The menu the view is inside of.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -182,6 +182,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
              }
  
              updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
@@ -174,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2548,6 +2548,17 @@ Google may use your browsing activity, content on some sites you visit, and othe
+@@ -2977,6 +2977,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
          Find in page
        </message>
@@ -193,5 +203,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
          Desktop site
        </message>
 -- 
-2.7.4
+2.11.0
 

build/patches/Add-option-to-not-persist-tabs-across-sessions.patch

@@ -0,0 +1,126 @@
+From: samartnik <artem@brave.com>
+Date: Tue, 17 Apr 2018 17:14:00 +0300
+Subject: Add option to not persist tabs across sessions
+
+---
+ chrome/android/java/res/values/values.xml                  |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml        |  5 +++++
+ .../org/chromium/chrome/browser/ChromeTabbedActivity.java  |  4 +++-
+ .../browser/preferences/privacy/PrivacyPreferences.java    | 14 ++++++++++++++
+ chrome/android/java/strings/android_chrome_strings.grd     |  6 ++++++
+ 5 files changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
++++ b/chrome/android/java/res/values/values.xml
+@@ -66,6 +66,9 @@
+     <!-- TODO(peconn): Add help section. -->
+     <!-- <string name="help_context_suggestions">mobile_content_suggestions</string> -->
+ 
++    <string name="close_tabs_on_exit_title">Close tabs on exit</string>
++    <string name="close_tabs_on_exit_summary">Don\'t persist tabs between browsing sessions</string>
++
+     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
+     <string name="manage_space_activity"></string>
+ 
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -13,6 +13,11 @@
+         android:summary="@string/navigation_error_summary"
+         android:defaultValue="true" />
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
++        android:key="close_tabs_on_exit"
++        android:title="@string/close_tabs_on_exit_title"
++        android:summary="@string/close_tabs_on_exit_summary"
++        android:defaultValue="false" />
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+         android:key="search_suggestions"
+         android:title="@string/search_suggestions_title"
+         android:summary="@string/search_suggestions_summary"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -1030,8 +1030,10 @@ public class ChromeTabbedActivity
+             boolean hadCipherData =
+                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
+ 
++            String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+             boolean noRestoreState =
+-                    CommandLine.getInstance().hasSwitch(ChromeSwitches.NO_RESTORE_STATE);
++                CommandLine.getInstance().hasSwitch(ChromeSwitches.NO_RESTORE_STATE) ||
++                ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
+             if (noRestoreState) {
+                 // Clear the state files because they are inconsistent and useless from now on.
+                 mTabModelSelectorImpl.clearState();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+@@ -4,6 +4,7 @@
+ 
+ package org.chromium.chrome.browser.preferences.privacy;
+ 
++import android.content.SharedPreferences;
+ import android.os.Bundle;
+ import android.preference.CheckBoxPreference;
+ import android.preference.Preference;
+@@ -15,6 +16,7 @@ import android.view.Menu;
+ import android.view.MenuInflater;
+ import android.view.MenuItem;
+ 
++import org.chromium.base.ContextUtils;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+@@ -42,6 +44,7 @@ public class PrivacyPreferences extends PreferenceFragment
+     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
++    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+     private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
+     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+@@ -91,6 +94,11 @@ public class PrivacyPreferences extends PreferenceFragment
+         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
+         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
+ 
++        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
++        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
++        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
++
+         ChromeBaseCheckBoxPreference networkPredictionPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
+         networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
+@@ -136,6 +144,12 @@ public class PrivacyPreferences extends PreferenceFragment
+         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
++        } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
++//            PrefServiceBridge.getInstance().setBoolean(
++//                    Pref.CLOSE_TABS_ON_EXIT_ENABLED, (boolean) newValue);
++            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
++            sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
++            sharedPreferencesEditor.apply();
+         }
+ 
+         return true;
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -3765,6 +3765,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
+       <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
+         IMAGE
+       </message>
++      <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
++        Close all open tabs on exit
++      </message>
++      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
++        Don't persist tabs between browsing sessions
++      </message>
+       <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
+         LINK
+       </message>
+-- 
+2.11.0
+

build/patches/Add-site-settings-option-for-session-only-cookies.patch

@@ -0,0 +1,223 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 28 Aug 2018 23:27:23 +0200
+Subject: Add site settings option for session-only cookies
+
+---
+ chrome/android/java/res/values/values.xml          |  3 +++
+ .../android/java/res/xml/website_preferences.xml   |  7 ++++++
+ .../browser/preferences/PrefServiceBridge.java     | 10 +++++++++
+ .../website/SingleCategoryPreferences.java         | 21 +++++++++++++++++-
+ .../java/strings/android_chrome_strings.grd        |  6 ++++++
+ .../android/preferences/pref_service_bridge.cc     | 25 ++++++++++++++++++++++
+ 6 files changed, 71 insertions(+), 1 deletion(-)
+
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
++++ b/chrome/android/java/res/values/values.xml
+@@ -39,6 +39,9 @@
+     <integer name="reload_button_level_reload">0</integer>
+     <integer name="reload_button_level_stop">1</integer>
+ 
++    <string name="allow_cookies_session_only_title">Keep cookies only until you quit your browser</string>
++    <string name="allow_cookies_session_only_summary">When enabled, all cookies will be erased when the browsing session is over</string>
++
+     <!-- Help and Feedback
+          These constants should be in sync with the context names on go/mobilehelprecs.
+          If the context ID cannot be found, the default help page will be shown to the user.-->
+diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/android/java/res/xml/website_preferences.xml
+--- a/chrome/android/java/res/xml/website_preferences.xml
++++ b/chrome/android/java/res/xml/website_preferences.xml
+@@ -26,6 +26,13 @@
+         android:summary="@string/allow_third_party_cookies_summary"
+         android:defaultValue="true"
+         android:persistent="false" />
++    <!-- A toggle for cookies to be saved only until session exit, only shown for the Cookies category. -->
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
++        android:key="cookies_session_only"
++        android:title="@string/allow_cookies_session_only_title"
++        android:summary="@string/allow_cookies_session_only_summary"
++        android:defaultValue="true"
++        android:persistent="false" />
+     <!-- A toggle for enabling vibration in notifications. -->
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+         android:key="notifications_vibrate"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+@@ -245,6 +245,10 @@ public class PrefServiceBridge {
+         return nativeGetBlockThirdPartyCookiesEnabled();
+     }
+ 
++    public boolean isCookiesSessionOnlyEnabled() {
++        return nativeGetCookiesSessionOnlyEnabled();
++    }
++
+     /**
+      * @return Whether third-party cookie blocking is configured by policy
+      */
+@@ -638,6 +642,10 @@ public class PrefServiceBridge {
+         nativeSetBlockThirdPartyCookiesEnabled(enabled);
+     }
+ 
++    public void setCookiesSessionOnlyEnabled(boolean enabled) {
++        nativeSetCookiesSessionOnlyEnabled(enabled);
++    }
++
+     public void setDoNotTrackEnabled(boolean enabled) {
+         nativeSetDoNotTrackEnabled(enabled);
+     }
+@@ -1086,6 +1094,7 @@ public class PrefServiceBridge {
+     private native boolean nativeGetAutoplayEnabled();
+     private native boolean nativeGetBackgroundSyncEnabled();
+     private native boolean nativeGetBlockThirdPartyCookiesEnabled();
++    private native boolean nativeGetCookiesSessionOnlyEnabled();
+     private native boolean nativeGetBlockThirdPartyCookiesManaged();
+     private native boolean nativeGetRememberPasswordsEnabled();
+     private native boolean nativeGetPasswordManagerAutoSigninEnabled();
+@@ -1132,6 +1141,7 @@ public class PrefServiceBridge {
+     private native void nativeSetAutoplayEnabled(boolean enabled);
+     private native void nativeSetAllowCookiesEnabled(boolean enabled);
+     private native void nativeSetBackgroundSyncEnabled(boolean enabled);
++    private native void nativeSetCookiesSessionOnlyEnabled(boolean enabled);
+     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
+     private native void nativeSetClipboardEnabled(boolean enabled);
+     private native void nativeSetDoNotTrackEnabled(boolean enabled);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
+@@ -110,6 +110,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+ 
+     // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
+     public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
++    public static final String COOKIES_SESSION_ONLY_TOGGLE_KEY = "cookies_session_only";
+     public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
+     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
+     private static final String ADD_EXCEPTION_KEY = "add_exception";
+@@ -438,6 +439,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+ 
+                 if (type == SiteSettingsCategory.Type.COOKIES) {
+                     updateThirdPartyCookiesCheckBox();
++                    updateCookiesSessionOnlyCheckBox();
+                 } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
+                     updateNotificationsVibrateCheckBox();
+                 }
+@@ -476,6 +478,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             getInfoForOrigins();
+         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
+             prefServiceBridge.setBlockThirdPartyCookiesEnabled(!((boolean) newValue));
++        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
++            prefServiceBridge.setCookiesSessionOnlyEnabled((boolean) newValue);
+         } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
+             prefServiceBridge.setNotificationsVibrateEnabled((boolean) newValue);
+         }
+@@ -738,6 +742,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+         TriStateSiteSettingsPreference triStateToggle =
+                 (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
+         Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
++        Preference cookiesSessionOnly = getPreferenceScreen().findPreference(
++                COOKIES_SESSION_ONLY_TOGGLE_KEY);
+         Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
+         Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
+         PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
+@@ -752,6 +758,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             screen.removePreference(binaryToggle);
+             screen.removePreference(triStateToggle);
+             screen.removePreference(thirdPartyCookies);
++            screen.removePreference(cookiesSessionOnly);
+             screen.removePreference(notificationsVibrate);
+             screen.removePreference(explainProtectedMediaKey);
+             screen.removePreference(allowedGroup);
+@@ -787,12 +794,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             configureBinaryToggle(binaryToggle, contentType);
+         }
+ 
+-        // Configure/hide the third-party cookie toggle, as needed.
++        // Configure/hide the third-party cookie toggle and session-only cookie toggle, as needed.
+         if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
+             thirdPartyCookies.setOnPreferenceChangeListener(this);
+             updateThirdPartyCookiesCheckBox();
++            cookiesSessionOnly.setOnPreferenceChangeListener(this);
++            updateCookiesSessionOnlyCheckBox();
+         } else {
+             screen.removePreference(thirdPartyCookies);
++            screen.removePreference(cookiesSessionOnly);
+         }
+ 
+         // Configure/hide the notifications vibrate toggle, as needed.
+@@ -878,6 +888,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+                 preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
+     }
+ 
++    private void updateCookiesSessionOnlyCheckBox() {
++        ChromeBaseCheckBoxPreference cookiesSessionOnlyPref = (ChromeBaseCheckBoxPreference)
++                getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY);
++        cookiesSessionOnlyPref.setChecked(
++                PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
++        cookiesSessionOnlyPref.setEnabled(PrefServiceBridge.getInstance().isCategoryEnabled(
++                ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES));
++    }
++
+     private void updateNotificationsVibrateCheckBox() {
+         ChromeBaseCheckBoxPreference preference =
+                 (ChromeBaseCheckBoxPreference) getPreferenceScreen().findPreference(
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -882,6 +882,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_ALLOW_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Allow Third Party Cookies preference">
+         Third-party websites can save and read cookie data
+       </message>
++      <message name="IDS_ALLOW_COOKIES_SESSION_ONLY_TITLE" desc="Title for Allow Cookies Session Only preference">
++        Keep cookies only until you quit your browser
++      </message>
++      <message name="IDS_ALLOW_COOKIES_SESSION_ONLY_SUMMARY" desc="Summary text for Allow Session Only Cookies preference">
++        When enabled, all cookies will be erased when the browsing session is over
++      </message>
+       <message name="IDS_JAVASCRIPT_PERMISSION_TITLE" desc="Title of the permission to run javascript [CHAR-LIMIT=32]">
+         JavaScript
+       </message>
+diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
+--- a/chrome/browser/android/preferences/pref_service_bridge.cc
++++ b/chrome/browser/android/preferences/pref_service_bridge.cc
+@@ -310,6 +310,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
+   return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies);
+ }
+ 
++static jboolean JNI_PrefServiceBridge_GetCookiesSessionOnlyEnabled(
++    JNIEnv* env,
++    const JavaParamRef<jobject>& obj) {
++  HostContentSettingsMap* host_content_settings_map =
++      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
++  auto value = host_content_settings_map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, nullptr);
++  auto enabled = CONTENT_SETTING_SESSION_ONLY == value;
++  LOG(INFO) << "GetCookiesSessionOnly := " << enabled << " (raw_value = " << value << ")";
++  return enabled;
++}
++
+ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj) {
+@@ -774,6 +785,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
+   GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
+ }
+ 
++static void JNI_PrefServiceBridge_SetCookiesSessionOnlyEnabled(
++    JNIEnv* env,
++    const JavaParamRef<jobject>& obj,
++    jboolean enabled) {
++  HostContentSettingsMap* host_content_settings_map =
++      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
++  LOG(INFO) << "SetCookiesSessionOnly -> " << (enabled ? "true" : "false") <<
++           "; false -> setting_allow: " << CONTENT_SETTING_ALLOW <<
++           "; true -> session_only: "   << CONTENT_SETTING_SESSION_ONLY;
++  host_content_settings_map->SetDefaultContentSetting(
++      CONTENT_SETTINGS_TYPE_COOKIES,
++      enabled ? CONTENT_SETTING_SESSION_ONLY : CONTENT_SETTING_ALLOW);
++}
++
+ static void JNI_PrefServiceBridge_SetRememberPasswordsEnabled(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj,
+-- 
+2.11.0
+

build/patches/Allow-building-without-safebrowsing-for-Android.patch

@@ -0,0 +1,767 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 18 Sep 2018 08:06:14 +0200
+Subject: Allow building without safebrowsing for Android
+
+Fix build from scratch (issue found by nikolowry)
+---
+ .../android/java/res/xml/privacy_preferences.xml   | 12 -----
+ .../preferences/privacy/PrivacyPreferences.java    | 58 ----------------------
+ .../chrome_browsing_data_remover_delegate.cc       | 10 ----
+ chrome/browser/chrome_content_browser_client.cc    | 14 +-----
+ .../file_type_policies_component_installer.cc      |  2 +
+ .../download/chrome_download_manager_delegate.cc   | 14 +++++-
+ .../download/chrome_download_manager_delegate.h    |  6 +++
+ chrome/browser/download/download_item_model.cc     | 10 ++++
+ chrome/browser/download/download_item_model.h      |  4 ++
+ chrome/browser/download/download_prefs.cc          |  4 ++
+ .../browser/download/download_target_determiner.cc | 18 +++++++
+ .../browser/download/download_target_determiner.h  |  6 +++
+ chrome/browser/download/download_target_info.cc    |  4 ++
+ chrome/browser/download/download_target_info.h     |  4 ++
+ chrome/browser/download/download_ui_model.cc       |  4 ++
+ chrome/browser/download/download_ui_model.h        |  4 ++
+ .../chrome_resource_dispatcher_host_delegate.cc    |  4 ++
+ chrome/browser/net/chrome_network_delegate.cc      | 35 +------------
+ 18 files changed, 85 insertions(+), 128 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -18,18 +18,6 @@
+         android:summary="@string/search_suggestions_summary"
+         android:defaultValue="true" />
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+-        android:key="safe_browsing_extended_reporting"
+-        android:title="@string/safe_browsing_extended_reporting_title"
+-        android:summary="@string/safe_browsing_extended_reporting_summary" />
+-    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+-        android:key="safe_browsing_scout_reporting"
+-        android:title="@string/safe_browsing_scout_reporting_title"
+-        android:summary="@string/safe_browsing_scout_reporting_summary" />
+-    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+-        android:key="safe_browsing"
+-        android:title="@string/safe_browsing_title"
+-        android:summary="@string/safe_browsing_summary" />
+-    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+         android:key="network_predictions"
+         android:title="@string/network_predictions_title"
+         android:summary="@string/network_predictions_summary"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+@@ -38,11 +38,6 @@ public class PrivacyPreferences extends PreferenceFragment
+         implements OnPreferenceChangeListener {
+     private static final String PREF_NAVIGATION_ERROR = "navigation_error";
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
+-    private static final String PREF_SAFE_BROWSING_EXTENDED_REPORTING =
+-            "safe_browsing_extended_reporting";
+-    private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
+-            "safe_browsing_scout_reporting";
+-    private static final String PREF_SAFE_BROWSING = "safe_browsing";
+     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
+     private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
+@@ -76,10 +71,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             // Remove preferences that were migrated to SyncAndServicesPreferences.
+             preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
+             preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
+-            preferenceScreen.removePreference(
+-                    findPreference(PREF_SAFE_BROWSING_EXTENDED_REPORTING));
+-            preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING));
+-            preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING));
+             preferenceScreen.removePreference(findPreference(PREF_NETWORK_PREDICTIONS));
+             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+             preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
+@@ -119,27 +110,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
+         }
+ 
+-        // Listen to changes to both Extended Reporting prefs.
+-        ChromeBaseCheckBoxPreference legacyExtendedReportingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(
+-                    PREF_SAFE_BROWSING_EXTENDED_REPORTING);
+-        legacyExtendedReportingPref.setOnPreferenceChangeListener(this);
+-        legacyExtendedReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-        ChromeBaseCheckBoxPreference scoutReportingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING);
+-        scoutReportingPref.setOnPreferenceChangeListener(this);
+-        scoutReportingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-        // Remove the extended reporting preference that is NOT active.
+-        String extended_reporting_pref_to_remove =
+-                prefServiceBridge.isSafeBrowsingScoutReportingActive()
+-                    ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING;
+-        preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove));
+-
+-        ChromeBaseCheckBoxPreference safeBrowsingPref =
+-                (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
+-        safeBrowsingPref.setOnPreferenceChangeListener(this);
+-        safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-
+         updateSummaries();
+     }
+ 
+@@ -148,12 +118,6 @@ public class PrivacyPreferences extends PreferenceFragment
+         String key = preference.getKey();
+         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+-        } else if (PREF_SAFE_BROWSING.equals(key)) {
+-            PrefServiceBridge.getInstance().setSafeBrowsingEnabled((boolean) newValue);
+-        } else if (PREF_SAFE_BROWSING_EXTENDED_REPORTING.equals(key)
+-                   || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
+-            PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
+-                    (boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+             recordNetworkPredictionEnablingUMA((boolean) newValue);
+@@ -202,21 +166,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
+         }
+ 
+-        String extended_reporting_pref = prefServiceBridge.isSafeBrowsingScoutReportingActive()
+-                ? PREF_SAFE_BROWSING_SCOUT_REPORTING : PREF_SAFE_BROWSING_EXTENDED_REPORTING;
+-        CheckBoxPreference extendedReportingPref =
+-                (CheckBoxPreference) findPreference(extended_reporting_pref);
+-        if (extendedReportingPref != null) {
+-            extendedReportingPref.setChecked(
+-                    prefServiceBridge.isSafeBrowsingExtendedReportingEnabled());
+-        }
+-
+-        CheckBoxPreference safeBrowsingPref =
+-                (CheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
+-        if (safeBrowsingPref != null) {
+-            safeBrowsingPref.setChecked(prefServiceBridge.isSafeBrowsingEnabled());
+-        }
+-
+         CheckBoxPreference canMakePaymentPref =
+                 (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
+         if (canMakePaymentPref != null) {
+@@ -253,13 +202,6 @@ public class PrivacyPreferences extends PreferenceFragment
+             if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+                 return prefs.isSearchSuggestManaged();
+             }
+-            if (PREF_SAFE_BROWSING_EXTENDED_REPORTING.equals(key)
+-                    || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
+-                return prefs.isSafeBrowsingExtendedReportingManaged();
+-            }
+-            if (PREF_SAFE_BROWSING.equals(key)) {
+-                return prefs.isSafeBrowsingManaged();
+-            }
+             if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+                 return prefs.isNetworkPredictionManaged();
+             }
+diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
++++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+@@ -254,16 +254,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask,
+   return false;
+ }
+ 
+-// Callback for when cookies have been deleted. Invokes NotifyIfDone.
+-// Receiving |cookie_manager| as a parameter so that the receive pipe is
+-// not deleted before the response is received.
+-void OnClearedCookies(base::OnceClosure done,
+-                      network::mojom::CookieManagerPtr cookie_manager,
+-                      uint32_t num_deleted) {
+-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-  std::move(done).Run();
+-}
+-
+ }  // namespace
+ 
+ ChromeBrowsingDataRemoverDelegate::ChromeBrowsingDataRemoverDelegate(
+diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -4853,19 +4853,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+     content::ResourceContext* resource_context) {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ 
+-  ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
+-  if (!io_data->safe_browsing_enabled()->GetValue())
+-    return nullptr;
+-
+-  // |safe_browsing_service_| may be unavailable in tests.
+-  if (safe_browsing_service_ && !safe_browsing_url_checker_delegate_) {
+-    safe_browsing_url_checker_delegate_ =
+-        base::MakeRefCounted<safe_browsing::UrlCheckerDelegateImpl>(
+-            safe_browsing_service_->database_manager(),
+-            safe_browsing_service_->ui_manager());
+-  }
+-
+-  return safe_browsing_url_checker_delegate_.get();
++  return nullptr;
+ }
+ 
+ base::Optional<std::string>
+diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc
+--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
++++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
+@@ -18,7 +18,9 @@
+ #include "base/path_service.h"
+ #include "base/task/post_task.h"
+ #include "base/version.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
++#endif
+ #include "components/component_updater/component_updater_paths.h"
+ 
+ using component_updater::ComponentUpdateService;
+diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
+--- a/chrome/browser/download/chrome_download_manager_delegate.cc
++++ b/chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -38,8 +38,10 @@
+ #include "chrome/browser/download/save_package_file_picker.h"
+ #include "chrome/browser/platform_util.h"
+ #include "chrome/browser/profiles/profile.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
++#endif
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_finder.h"
+ #include "chrome/browser/ui/chrome_pages.h"
+@@ -49,7 +51,9 @@
+ #include "chrome/common/chrome_features.h"
+ #include "chrome/common/pdf_util.h"
+ #include "chrome/common/pref_names.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
++#endif
+ #include "chrome/grit/generated_resources.h"
+ #include "components/download/database/in_progress/in_progress_cache_impl.h"
+ #include "components/download/public/common/download_interrupt_reasons.h"
+@@ -95,8 +99,10 @@
+ using content::BrowserThread;
+ using download::DownloadItem;
+ using content::DownloadManager;
++#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
+ using safe_browsing::DownloadProtectionService;
++#endif
+ 
+ namespace {
+ 
+@@ -746,19 +752,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const {
+   return std::string(chrome::kApplicationClientIDStringForAVScanning);
+ }
+ 
++#if defined(FULL_SAFE_BROWSING)
+ DownloadProtectionService*
+     ChromeDownloadManagerDelegate::GetDownloadProtectionService() {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+-#if defined(FULL_SAFE_BROWSING)
+   safe_browsing::SafeBrowsingService* sb_service =
+       g_browser_process->safe_browsing_service();
+   if (sb_service && sb_service->download_protection_service() &&
+       profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {
+     return sb_service->download_protection_service();
+   }
+-#endif
+   return NULL;
+ }
++#endif
+ 
+ void ChromeDownloadManagerDelegate::NotifyExtensions(
+     DownloadItem* download,
+@@ -1201,13 +1207,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
+       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
+ #endif
+ 
++#if defined(FULL_SAFE_BROWSING)
+     DownloadItemModel(item).SetDangerLevel(target_info->danger_level);
++#endif
+   }
++#if defined(FULL_SAFE_BROWSING)
+   if (ShouldBlockFile(target_info->danger_type, item)) {
+     target_info->result = download::DOWNLOAD_INTERRUPT_REASON_FILE_BLOCKED;
+     // A dangerous type would take precendence over the blocking of the file.
+     target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
+   }
++#endif
+ 
+   callback.Run(target_info->target_path, target_info->target_disposition,
+                target_info->danger_type, target_info->intermediate_path,
+diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
+--- a/chrome/browser/download/chrome_download_manager_delegate.h
++++ b/chrome/browser/download/chrome_download_manager_delegate.h
+@@ -22,8 +22,10 @@
+ #include "chrome/browser/download/download_path_reservation_tracker.h"
+ #include "chrome/browser/download/download_target_determiner_delegate.h"
+ #include "chrome/browser/download/download_target_info.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
+ #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
++#endif
+ #include "components/download/public/common/download_danger_type.h"
+ #include "components/download/public/common/download_item.h"
+ #include "content/public/browser/download_manager_delegate.h"
+@@ -131,8 +133,10 @@ class ChromeDownloadManagerDelegate
+   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
+ 
+  protected:
++#if defined(FULL_SAFE_BROWSING)
+   virtual safe_browsing::DownloadProtectionService*
+       GetDownloadProtectionService();
++#endif
+ 
+   // Show file picker for |download|.
+   virtual void ShowFilePickerForDownload(
+@@ -197,9 +201,11 @@ class ChromeDownloadManagerDelegate
+                const content::NotificationSource& source,
+                const content::NotificationDetails& details) override;
+ 
++#if defined(FULL_SAFE_BROWSING)
+   // Callback function after the DownloadProtectionService completes.
+   void CheckClientDownloadDone(uint32_t download_id,
+                                safe_browsing::DownloadCheckResult result);
++#endif
+ 
+   // Internal gateways for ShouldCompleteDownload().
+   bool IsDownloadReadyForCompletion(
+diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
+--- a/chrome/browser/download/download_item_model.cc
++++ b/chrome/browser/download/download_item_model.cc
+@@ -22,9 +22,11 @@
+ #include "chrome/browser/download/download_stats.h"
+ #include "chrome/browser/download/offline_item_utils.h"
+ #include "chrome/browser/profiles/profile.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/browser/safe_browsing/download_protection/download_feedback_service.h"
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
+ #include "chrome/common/safe_browsing/file_type_policies.h"
++#endif
+ #include "chrome/grit/chromium_strings.h"
+ #include "chrome/grit/generated_resources.h"
+ #include "components/download/public/common/download_danger_type.h"
+@@ -37,7 +39,9 @@
+ 
+ using base::TimeDelta;
+ using download::DownloadItem;
++#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
++#endif
+ 
+ namespace {
+ 
+@@ -67,9 +71,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
+   // for the file type.
+   bool should_prefer_opening_in_browser_;
+ 
++#if defined(FULL_SAFE_BROWSING)
+   // Danger level of the file determined based on the file type and whether
+   // there was a user action associated with the download.
+   DownloadFileType::DangerLevel danger_level_;
++#endif
+ 
+   // Whether the download is currently being revived.
+   bool is_being_revived_;
+@@ -106,7 +112,9 @@ DownloadItemModelData::DownloadItemModelData()
+     : should_show_in_shelf_(true),
+       was_ui_notified_(false),
+       should_prefer_opening_in_browser_(false),
++#if defined(FULL_SAFE_BROWSING)
+       danger_level_(DownloadFileType::NOT_DANGEROUS),
++#endif
+       is_being_revived_(false) {}
+ 
+ } // namespace
+@@ -376,6 +384,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
+   data->should_prefer_opening_in_browser_ = preference;
+ }
+ 
++#if defined(FULL_SAFE_BROWSING)
+ DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
+   const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
+   return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
+@@ -386,6 +395,7 @@ void DownloadItemModel::SetDangerLevel(
+   DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
+   data->danger_level_ = danger_level;
+ }
++#endif
+ 
+ bool DownloadItemModel::IsBeingRevived() const {
+   const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
+diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
+--- a/chrome/browser/download/download_item_model.h
++++ b/chrome/browser/download/download_item_model.h
+@@ -11,7 +11,9 @@
+ #include "base/macros.h"
+ #include "base/strings/string16.h"
+ #include "chrome/browser/download/download_ui_model.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
++#endif
+ #include "components/download/public/common/download_item.h"
+ 
+ // Implementation of DownloadUIModel that wrappers around a |DownloadItem*|. As
+@@ -48,9 +50,11 @@ class DownloadItemModel : public DownloadUIModel,
+   void SetWasUINotified(bool should_notify) override;
+   bool ShouldPreferOpeningInBrowser() const override;
+   void SetShouldPreferOpeningInBrowser(bool preference) override;
++#if defined(FULL_SAFE_BROWSING)
+   safe_browsing::DownloadFileType::DangerLevel GetDangerLevel() const override;
+   void SetDangerLevel(
+       safe_browsing::DownloadFileType::DangerLevel danger_level) override;
++#endif
+   void OpenUsingPlatformHandler() override;
+   bool IsBeingRevived() const override;
+   void SetIsBeingRevived(bool is_being_revived) override;
+diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
+--- a/chrome/browser/download/download_prefs.cc
++++ b/chrome/browser/download/download_prefs.cc
+@@ -33,7 +33,9 @@
+ #include "chrome/common/chrome_features.h"
+ #include "chrome/common/chrome_paths.h"
+ #include "chrome/common/pref_names.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
++#endif
+ #include "components/download/public/common/download_item.h"
+ #include "components/pref_registry/pref_registry_syncable.h"
+ #include "components/prefs/pref_service.h"
+@@ -55,7 +57,9 @@
+ using content::BrowserContext;
+ using content::BrowserThread;
+ using content::DownloadManager;
++#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::FileTypePolicies;
++#endif
+ 
+ namespace {
+ 
+diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
+--- a/chrome/browser/download/download_target_determiner.cc
++++ b/chrome/browser/download/download_target_determiner.cc
+@@ -22,7 +22,9 @@
+ #include "chrome/browser/history/history_service_factory.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/common/pref_names.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
++#endif
+ #include "chrome/grit/generated_resources.h"
+ #include "components/download/public/common/download_interrupt_reasons.h"
+ #include "components/history/core/browser/history_service.h"
+@@ -56,13 +58,16 @@
+ 
+ using content::BrowserThread;
+ using download::DownloadItem;
++#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
++#endif
+ 
+ namespace {
+ 
+ const base::FilePath::CharType kCrdownloadSuffix[] =
+     FILE_PATH_LITERAL(".crdownload");
+ 
++#if defined(FULL_SAFE_BROWSING)
+ // Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a
+ // single bool. A host is considered visited before if prior visible visits were
+ // found in history and the first such visit was earlier than the most recent
+@@ -76,6 +81,7 @@ void VisitCountsToVisitedBefore(
+       found_visits && count > 0 &&
+       (first_visit.LocalMidnight() < base::Time::Now().LocalMidnight()));
+ }
++#endif
+ 
+ #if defined(OS_WIN)
+ // Keeps track of whether Adobe Reader is up to date.
+@@ -100,7 +106,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer(
+       create_target_directory_(false),
+       conflict_action_(conflict_action),
+       danger_type_(download->GetDangerType()),
++#if defined(FULL_SAFE_BROWSING)
+       danger_level_(DownloadFileType::NOT_DANGEROUS),
++#endif
+       virtual_path_(initial_virtual_path),
+       is_filetype_handled_safely_(false),
+ #if defined(OS_ANDROID)
+@@ -719,6 +727,7 @@ DownloadTargetDeterminer::Result
+     return CONTINUE;
+   }
+ 
++#if defined(FULL_SAFE_BROWSING)
+   // First determine the danger level assuming that the user doesn't have any
+   // prior visits to the referrer recoreded in history. The resulting danger
+   // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit
+@@ -755,6 +764,7 @@ DownloadTargetDeterminer::Result
+   // invalid, then assume the referrer has not been visited before.
+   if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
+     danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
++#endif
+   return CONTINUE;
+ }
+ 
+@@ -762,11 +772,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
+     bool visited_referrer_before) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+   DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
++#if defined(FULL_SAFE_BROWSING)
+   danger_level_ = GetDangerLevel(
+       visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
+   if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
+       danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
+     danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
++#endif
+   DoLoop();
+ }
+ 
+@@ -861,7 +873,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
+             << " Intermediate:" << intermediate_path_.AsUTF8Unsafe()
+             << " Confirmation reason:" << static_cast<int>(confirmation_reason_)
+             << " Danger type:" << danger_type_
++#if defined(FULL_SAFE_BROWSING)
+             << " Danger level:" << danger_level_
++#endif
+             << " Result:" << static_cast<int>(result);
+   std::unique_ptr<DownloadTargetInfo> target_info(new DownloadTargetInfo);
+ 
+@@ -873,7 +887,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
+            ? DownloadItem::TARGET_DISPOSITION_PROMPT
+            : DownloadItem::TARGET_DISPOSITION_OVERWRITE);
+   target_info->danger_type = danger_type_;
++#if defined(FULL_SAFE_BROWSING)
+   target_info->danger_level = danger_level_;
++#endif
+   target_info->intermediate_path = intermediate_path_;
+   target_info->mime_type = mime_type_;
+   target_info->is_filetype_handled_safely = is_filetype_handled_safely_;
+@@ -959,6 +975,7 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
+                                 DownloadItem::TARGET_DISPOSITION_PROMPT);
+ }
+ 
++#if defined(FULL_SAFE_BROWSING)
+ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+     PriorVisitsToReferrer visits) const {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+@@ -990,6 +1007,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+ 
+   return DownloadFileType::NOT_DANGEROUS;
+ }
++#endif
+ 
+ void DownloadTargetDeterminer::OnDownloadDestroyed(
+     DownloadItem* download) {
+diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
+--- a/chrome/browser/download/download_target_determiner.h
++++ b/chrome/browser/download/download_target_determiner.h
+@@ -17,7 +17,9 @@
+ #include "chrome/browser/download/download_path_reservation_tracker.h"
+ #include "chrome/browser/download/download_target_determiner_delegate.h"
+ #include "chrome/browser/download/download_target_info.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
++#endif
+ #include "components/download/public/common/download_danger_type.h"
+ #include "components/download/public/common/download_item.h"
+ #include "content/public/browser/download_manager_delegate.h"
+@@ -297,6 +299,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+   // operation.
+   bool HasPromptedForPath() const;
+ 
++#if defined(FULL_SAFE_BROWSING)
+   // Returns true if this download should show the "dangerous file" warning.
+   // Various factors are considered, such as the type of the file, whether a
+   // user action initiated the download, and whether the user has explicitly
+@@ -306,6 +309,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+   // to true if the download requires explicit user consent.
+   safe_browsing::DownloadFileType::DangerLevel GetDangerLevel(
+       PriorVisitsToReferrer visits) const;
++#endif
+ 
+   // download::DownloadItem::Observer
+   void OnDownloadDestroyed(download::DownloadItem* download) override;
+@@ -317,7 +321,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
+   bool create_target_directory_;
+   DownloadPathReservationTracker::FilenameConflictAction conflict_action_;
+   download::DownloadDangerType danger_type_;
++#if defined(FULL_SAFE_BROWSING)
+   safe_browsing::DownloadFileType::DangerLevel danger_level_;
++#endif
+   base::FilePath virtual_path_;
+   base::FilePath local_path_;
+   base::FilePath intermediate_path_;
+diff --git a/chrome/browser/download/download_target_info.cc b/chrome/browser/download/download_target_info.cc
+--- a/chrome/browser/download/download_target_info.cc
++++ b/chrome/browser/download/download_target_info.cc
+@@ -4,12 +4,16 @@
+ 
+ #include "chrome/browser/download/download_target_info.h"
+ 
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/file_type_policies.h"
++#endif
+ 
+ DownloadTargetInfo::DownloadTargetInfo()
+     : target_disposition(download::DownloadItem::TARGET_DISPOSITION_OVERWRITE),
+       danger_type(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
++#if defined(FULL_SAFE_BROWSING)
+       danger_level(safe_browsing::DownloadFileType::NOT_DANGEROUS),
++#endif
+       is_filetype_handled_safely(false),
+       result(download::DOWNLOAD_INTERRUPT_REASON_NONE) {}
+ 
+diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/download/download_target_info.h
+--- a/chrome/browser/download/download_target_info.h
++++ b/chrome/browser/download/download_target_info.h
+@@ -8,7 +8,9 @@
+ #include <string>
+ 
+ #include "base/files/file_path.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
++#endif
+ #include "components/download/public/common/download_danger_type.h"
+ #include "components/download/public/common/download_interrupt_reasons.h"
+ #include "components/download/public/common/download_item.h"
+@@ -32,6 +34,7 @@ struct DownloadTargetInfo {
+   // Danger type of the download.
+   download::DownloadDangerType danger_type;
+ 
++#if defined(FULL_SAFE_BROWSING)
+   // The danger type of the download could be set to MAYBE_DANGEROUS_CONTENT if
+   // the file type is handled by SafeBrowsing. However, if the SafeBrowsing
+   // service is unable to verify whether the file is safe or not, we are on our
+@@ -57,6 +60,7 @@ struct DownloadTargetInfo {
+   //       SafeBrowsing may flag the file as being malicious, in which case the
+   //       malicious classification should take precedence.
+   safe_browsing::DownloadFileType::DangerLevel danger_level;
++#endif
+ 
+   // Suggested intermediate path. The downloaded bytes should be written to this
+   // path until all the bytes are available and the user has accepted a
+diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc
+--- a/chrome/browser/download/download_ui_model.cc
++++ b/chrome/browser/download/download_ui_model.cc
+@@ -23,7 +23,9 @@
+ 
+ using base::TimeDelta;
+ using download::DownloadItem;
++#if defined(FULL_SAFE_BROWSING)
+ using safe_browsing::DownloadFileType;
++#endif
+ using offline_items_collection::FailState;
+ 
+ namespace {
+@@ -368,12 +370,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const {
+ 
+ void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {}
+ 
++#if defined(FULL_SAFE_BROWSING)
+ DownloadFileType::DangerLevel DownloadUIModel::GetDangerLevel() const {
+   return DownloadFileType::NOT_DANGEROUS;
+ }
+ 
+ void DownloadUIModel::SetDangerLevel(
+     DownloadFileType::DangerLevel danger_level) {}
++#endif
+ 
+ void DownloadUIModel::OpenUsingPlatformHandler() {}
+ 
+diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h
+--- a/chrome/browser/download/download_ui_model.h
++++ b/chrome/browser/download/download_ui_model.h
+@@ -14,7 +14,9 @@
+ #include "base/strings/string16.h"
+ #include "build/build_config.h"
+ #include "chrome/browser/profiles/profile_manager.h"
++#if defined(FULL_SAFE_BROWSING)
+ #include "chrome/common/safe_browsing/download_file_types.pb.h"
++#endif
+ #include "components/download/public/common/download_item.h"
+ #include "components/offline_items_collection/core/offline_item.h"
+ 
+@@ -172,6 +174,7 @@ class DownloadUIModel {
+   // Change what's returned by ShouldPreferOpeningInBrowser to |preference|.
+   virtual void SetShouldPreferOpeningInBrowser(bool preference);
+ 
++#if defined(FULL_SAFE_BROWSING)
+   // Return the danger level determined during download target determination.
+   // The value returned here is independent of the danger level as determined by
+   // the Safe Browsing.
+@@ -180,6 +183,7 @@ class DownloadUIModel {
+   // Change what's returned by GetDangerLevel().
+   virtual void SetDangerLevel(
+       safe_browsing::DownloadFileType::DangerLevel danger_level);
++#endif
+ 
+   // Open the download using the platform handler for the download. The behavior
+   // of this method will be different from DownloadItem::OpenDownload() if
+diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
++++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+@@ -451,14 +451,18 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
+     content::ResourceContext* resource_context,
+     ResourceType resource_type,
+     std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
++#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
++#endif  // defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+ 
+   // Insert either safe browsing or data reduction proxy throttle at the front
+   // of the list, so one of them gets to decide if the resource is safe.
+   content::ResourceThrottle* first_throttle = NULL;
+ #if defined(OS_ANDROID)
++#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+   first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
+       request, resource_context, resource_type, nullptr);
++#endif
+ #endif  // defined(OS_ANDROID)
+ 
+ #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
+diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
+--- a/chrome/browser/net/chrome_network_delegate.cc
++++ b/chrome/browser/net/chrome_network_delegate.cc
+@@ -79,19 +79,6 @@ namespace {
+ 
+ bool g_access_to_all_files_enabled = false;
+ 
+-// Gets called when the extensions finish work on the URL. If the extensions
+-// did not do a redirect (so |new_url| is empty) then we enforce the
+-// SafeSearch parameters. Otherwise we will get called again after the
+-// redirect and we enforce SafeSearch then.
+-void ForceGoogleSafeSearchCallbackWrapper(net::CompletionOnceCallback callback,
+-                                          net::URLRequest* request,
+-                                          GURL* new_url,
+-                                          int rv) {
+-  if (rv == net::OK && new_url->is_empty())
+-    safe_search_util::ForceGoogleSafeSearch(request->url(), new_url);
+-  std::move(callback).Run(rv);
+-}
+-
+ bool IsAccessAllowedInternal(const base::FilePath& path,
+                              const base::FilePath& profile_path) {
+   if (g_access_to_all_files_enabled)
+@@ -213,26 +200,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
+     GURL* new_url) {
+   extensions_delegate_->ForwardStartRequestStatus(request);
+ 
+-  // The non-redirect case is handled in GoogleURLLoaderThrottle.
+-  bool force_safe_search =
+-      (force_google_safe_search_ && force_google_safe_search_->GetValue() &&
+-       request->is_redirecting());
+-
+-  net::CompletionOnceCallback wrapped_callback = std::move(callback);
+-
+-  if (force_safe_search) {
+-    wrapped_callback = base::BindOnce(
+-        &ForceGoogleSafeSearchCallbackWrapper, std::move(wrapped_callback),
+-        base::Unretained(request), base::Unretained(new_url));
+-  }
+-
+-  int rv = extensions_delegate_->NotifyBeforeURLRequest(
+-      request, std::move(wrapped_callback), new_url);
+-
+-  if (force_safe_search && rv == net::OK && new_url->is_empty())
+-    safe_search_util::ForceGoogleSafeSearch(request->url(), new_url);
+-
+-  return rv;
++  return extensions_delegate_->NotifyBeforeURLRequest(
++      request, std::move(callback), new_url);
+ }
+ 
+ int ChromeNetworkDelegate::OnBeforeStartTransaction(
+-- 
+2.11.0
+

build/patches/Allow-playing-audio-in-background.patch

@@ -10,7 +10,7 @@ Subject: Allow playing audio in background
 diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
 --- a/media/blink/webmediaplayer_impl.cc
 +++ b/media/blink/webmediaplayer_impl.cc
-@@ -853,6 +853,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -908,6 +908,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -23,10 +23,10 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -2877,7 +2883,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
+@@ -3053,7 +3059,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
    // If suspending background video, pause any video that's not remoted or
    // not unlocked to play in the background.
-   if (IsBackgroundedSuspendEnabled()) {
+   if (IsBackgroundSuspendEnabled(delegate_)) {
 -    if (!HasVideo())
 +    //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
 +    //see media/base/pipeline_metadata.h. This is a workaround to allow audio
@@ -38,7 +38,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
 --- a/media/blink/webmediaplayer_impl.h
 +++ b/media/blink/webmediaplayer_impl.h
-@@ -155,6 +155,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+@@ -161,6 +161,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
    // True if the loaded media has a playable video/audio track.
    bool HasVideo() const override;
    bool HasAudio() const override;
@@ -48,5 +48,5 @@ diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl
    void EnabledAudioTracksChanged(
        const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
 -- 
-2.7.4
+2.11.0
 

build/patches/Allow-website-sign-in-without-account-sign-in.patch

@@ -0,0 +1,24 @@
+From: xsmile <xsmile@users.noreply.github.com>
+Date: Thu, 11 Oct 2018 21:29:35 +0200
+Subject: Allow website sign-in without account sign-in
+
+Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found in chrome://settings
+---
+ chrome/browser/signin/account_consistency_mode_manager.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
+--- a/chrome/browser/signin/account_consistency_mode_manager.cc
++++ b/chrome/browser/signin/account_consistency_mode_manager.cc
+@@ -175,7 +175,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
+                                 false);
+ #endif
+-  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
++  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
+ }
+ 
+ // static
+-- 
+2.11.0
+

build/patches/Always-allow-partner-customisation.patch

@@ -9,9 +9,9 @@ Subject: Always allow partner customisation
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
+@@ -242,14 +242,14 @@ public class PartnerBrowserCustomizations {
              @Override
-             protected Void doInBackground(Void... params) {
+             protected Void doInBackground() {
                  try {
 -                    boolean systemOrPreStable =
 -                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
@@ -33,5 +33,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
                      if (isCancelled()) return null;
                      refreshIncognitoModeDisabled();
 -- 
-2.7.4
+2.11.0
 

build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch

@@ -4,34 +4,26 @@ Subject: Always respect async dns flag (regardless of SDK version)
 
 Do not read experiment value for cronet async DNS configuration
 ---
- chrome/browser/io_thread.cc                     | 10 +---------
- components/cronet/url_request_context_config.cc |  3 ++-
- 2 files changed, 3 insertions(+), 10 deletions(-)
+ chrome/browser/net/system_network_context_manager.cc | 2 +-
+ components/cronet/url_request_context_config.cc      | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
---- a/chrome/browser/io_thread.cc
-+++ b/chrome/browser/io_thread.cc
-@@ -258,15 +258,7 @@ void UpdateMetricsUsagePrefsOnUIThread(const std::string& service_name,
- // Check the AsyncDns field trial and return true if it should be enabled. On
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
++++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -216,7 +216,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
  // Android this includes checking the Android version in the field trial.
  bool ShouldEnableAsyncDns() {
--  bool feature_can_be_enabled = true;
+   bool feature_can_be_enabled = true;
 -#if defined(OS_ANDROID)
--  int min_sdk =
--      base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0);
--  if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk)
--    feature_can_be_enabled = false;
--#endif
--  return feature_can_be_enabled &&
--         base::FeatureList::IsEnabled(features::kAsyncDns);
-+  return base::FeatureList::IsEnabled(features::kAsyncDns);
- }
- 
- }  // namespace
++#if 0
+   int min_sdk =
+       base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0);
+   if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk)
 diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
 --- a/components/cronet/url_request_context_config.cc
 +++ b/components/cronet/url_request_context_config.cc
-@@ -398,7 +398,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+@@ -476,7 +476,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
          effective_experimental_options->Remove(it.key(), nullptr);
          continue;
        }
@@ -42,5 +34,5 @@ diff --git a/components/cronet/url_request_context_config.cc b/components/cronet
        const base::DictionaryValue* stale_dns_args = nullptr;
        if (!it.value().GetAsDictionary(&stale_dns_args)) {
 -- 
-2.7.4
+2.11.0
 

build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch

@@ -6,8 +6,8 @@ Return fixed base latency
 ---
  third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
  third_party/blink/renderer/modules/webaudio/audio_buffer.idl  | 4 ++--
- third_party/blink/renderer/modules/webaudio/audio_context.cc  | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
+ third_party/blink/renderer/modules/webaudio/audio_context.cc  | 1 +
+ 3 files changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
@@ -43,15 +43,14 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -261,7 +261,7 @@ void AudioContext::StopRendering() {
- }
- 
+@@ -320,6 +320,7 @@ void AudioContext::StopRendering() {
  double AudioContext::baseLatency() const {
--  return FramesPerBuffer() / static_cast<double>(sampleRate());
+   DCHECK(IsMainThread());
+   DCHECK(destination());
 +  return 0.04;
- }
  
- }  // namespace blink
+   // TODO(hongchan): Due to the incompatible constructor between
+   // AudioDestinationNode and DefaultAudioDestinationNode, casting directly from
 -- 
-2.7.4
+2.11.0
 

build/patches/Battery-API-return-nothing.patch

@@ -0,0 +1,64 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 22 Mar 2018 22:11:57 +0100
+Subject: Battery API: return nothing
+
+---
+ .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
+--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
++++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
+@@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+ }
+ 
+ bool BatteryManager::charging() {
+-  return battery_status_.Charging();
++  return false;
+ }
+ 
+ double BatteryManager::chargingTime() {
+-  return battery_status_.charging_time();
++  return 0;
+ }
+ 
+ double BatteryManager::dischargingTime() {
+-  return battery_status_.discharging_time();
++  return 0;
+ }
+ 
+ double BatteryManager::level() {
+-  return battery_status_.Level();
++  return 1;
+ }
+ 
+ void BatteryManager::DidUpdateData() {
+   DCHECK(battery_property_);
+ 
+-  BatteryStatus old_status = battery_status_;
+-  battery_status_ = *BatteryDispatcher::Instance().LatestData();
+-
+   if (battery_property_->GetState() == ScriptPromisePropertyBase::kPending) {
+     battery_property_->Resolve(this);
+     return;
+   }
+-
+-  Document* document = To<Document>(GetExecutionContext());
+-  DCHECK(document);
+-  if (document->IsContextPaused() || document->IsContextDestroyed())
+-    return;
+-
+-  if (battery_status_.Charging() != old_status.Charging())
+-    DispatchEvent(*Event::Create(EventTypeNames::chargingchange));
+-  if (battery_status_.charging_time() != old_status.charging_time())
+-    DispatchEvent(*Event::Create(EventTypeNames::chargingtimechange));
+-  if (battery_status_.discharging_time() != old_status.discharging_time())
+-    DispatchEvent(*Event::Create(EventTypeNames::dischargingtimechange));
+-  if (battery_status_.Level() != old_status.Level())
+-    DispatchEvent(*Event::Create(EventTypeNames::levelchange));
+ }
+ 
+ void BatteryManager::RegisterWithDispatcher() {
+-- 
+2.11.0
+

build/patches/Bromite-adblock-engine.patch

@@ -0,0 +1,715 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 23 Aug 2018 19:30:15 +0200
+Subject: Bromite adblock engine
+
+Original adblock engine ported from NoChromo patch
+Make interception testable
+Add domain support
+Re-land: third-party filters support
+Add menu option to toggle global Adblock preference
+Allow toggling Chromium's "ads enabled" content settings option together with Bromite adblock engine.
+Perform adblock interception in StartJob to address lagging issues
+New mechanism for adblocking based on Brave's adblocking hook
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  |  12 +
+ chrome/android/java/res/menu/main_menu.xml         |  11 +
+ .../chromium/chrome/browser/ChromeActivity.java    |   8 +
+ .../chrome/browser/ChromeTabbedActivity.java       |   8 +
+ .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
+ .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
+ .../java/strings/android_chrome_strings.grd        |  11 +
+ chrome/browser/net/chrome_network_delegate.cc      |  62 ++++
+ .../subresource_filter_content_settings_manager.cc |   1 +
+ net/BUILD.gn                                       |   7 +
+ net/url_request/adblock_intercept.cc               | 341 +++++++++++++++++++++
+ net/url_request/adblock_intercept.h                |  41 +++
+ 12 files changed, 542 insertions(+)
+ create mode 100644 net/url_request/adblock_intercept.cc
+ create mode 100644 net/url_request/adblock_intercept.h
+
+diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
++++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -74,6 +74,18 @@
+           </menu>
+         </item>
+ 
++        <item android:id="@+id/enable_adblock_row_menu_id"
++            android:title="@null"
++            android:orderInCategory="2">
++          <menu>
++              <item android:id="@+id/enable_adblock_id"
++                  android:title="@string/menu_enable_adblock" />
++              <item android:id="@+id/enable_adblock_check_id"
++                  android:title="@null"
++                  android:checkable="true" />
++          </menu>
++        </item>
++
+         <!-- Title is intentionally left blank in xml and will be set in java. -->
+         <item android:id="@+id/open_in_browser_id"
+             android:title=""
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
++++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -84,6 +84,17 @@
+           </menu>
+         </item>
+ 
++        <item android:id="@+id/enable_adblock_row_menu_id"
++            android:title="@null">
++          <menu>
++              <item android:id="@+id/enable_adblock_id"
++                  android:title="@string/menu_enable_adblock" />
++              <item android:id="@+id/enable_adblock_check_id"
++                  android:title="@null"
++                  android:checkable="true" />
++          </menu>
++        </item>
++
+         <item android:id="@+id/reader_mode_prefs_id"
+             android:title="@string/menu_reader_mode_prefs"
+             android:icon="@drawable/reader_mode_prefs_icon" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -2205,6 +2205,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.reader_mode_prefs_id) {
+             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
++        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
++            final boolean reloadOnChange = !currentTab.isNativePage();
++            final boolean adblockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, adblockEnabled);
++            if (reloadOnChange) {
++                currentTab.reload();
++            }
++            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else {
+             return false;
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -1676,6 +1676,14 @@ public class ChromeTabbedActivity
+                 reportNewTabShortcutUsed(true);
+                 getTabCreator(true).launchNTP();
+             }
++        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
++            final boolean reloadOnChange = !currentTab.isNativePage();
++            final boolean adblockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, adblockEnabled);
++            if (reloadOnChange) {
++                currentTab.reload();
++            }
++            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else if (id == R.id.all_bookmarks_menu_id) {
+             if (currentTab != null) {
+                 getCompositorViewHolder().hideKeyboard(() -> {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+@@ -208,6 +208,8 @@ public class AppMenuPropertiesDelegate {
+                     && !TextUtils.isEmpty(url);
+             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
+ 
++            updateEnableAdBlockMenuItem(menu, currentTab);
++
+             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+ 
+             updateEnableJavascriptMenuItem(menu, currentTab);
+@@ -486,6 +488,42 @@ public class AppMenuPropertiesDelegate {
+     }
+ 
+     /**
++     * Updates the enable AdBlock item's state.
++     *
++     * @param menu {@link Menu} for enable adblock
++     * @param currentTab      Current tab being displayed.
++     */
++    protected void updateEnableAdBlockMenuItem(
++            Menu menu, Tab currentTab) {
++        MenuItem enableMenuRow = menu.findItem(R.id.enable_adblock_row_menu_id);
++        MenuItem enableMenuLabel = menu.findItem(R.id.enable_adblock_id);
++        MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
++
++
++        // Hide enable adblock on all chrome:// pages except for the NTP.
++        String url = currentTab.getUrl();
++        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
++                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
++        // Also hide enable javascsript on Reader Mode.
++        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
++
++        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
++        enableMenuRow.setVisible(itemVisible);
++        if (!itemVisible) return;
++
++        boolean adBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++
++        // Mark the checkbox if adblock is globally activate.
++        enableMenuCheck.setChecked(adBlockEnabled);
++
++        // This title doesn't seem to be displayed by Android, but it is used to set up
++        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
++        enableMenuLabel.setTitleCondensed(adBlockEnabled
++                        ? mActivity.getString(R.string.menu_enable_adblock_on)
++                        : mActivity.getString(R.string.menu_enable_adblock_off));
++    }
++
++    /**
+      * A notification that the header view has finished inflating.
+      * @param view The view that was inflated.
+      * @param appMenu The menu the view is inside of.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -181,6 +181,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+                 }
+             }
+ 
++            updateEnableAdBlockMenuItem(menu, currentTab);
++
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+             updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -2997,6 +2997,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
+         Turn on Request desktop site
+       </message>
++
++      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable AdBlock engine for the page. [CHAR-LIMIT=27]">
++        Enable AdBlock
++      </message>
++      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
++        Turn off AdBlock
++      </message>
++      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
++        Turn on AdBlock
++      </message>
++
+       <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">
+         Appearance
+       </message>
+diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
+--- a/chrome/browser/net/chrome_network_delegate.cc
++++ b/chrome/browser/net/chrome_network_delegate.cc
+@@ -25,6 +25,7 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/content_settings/cookie_settings_factory.h"
++#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+ #include "chrome/browser/content_settings/tab_specific_content_settings.h"
+ #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
+ #include "chrome/browser/net/chrome_extensions_network_delegate.h"
+@@ -60,6 +61,7 @@
+ #if defined(OS_ANDROID)
+ #include "base/android/path_utils.h"
+ #include "chrome/browser/io_thread.h"
++#include "net/url_request/adblock_intercept.h"
+ #endif
+ 
+ #if defined(OS_CHROMEOS)
+@@ -194,16 +196,76 @@ void ChromeNetworkDelegate::set_cookie_settings(
+   cookie_settings_ = cookie_settings;
+ }
+ 
++#define TRANSPARENT1PXGIF "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
++
+ int ChromeNetworkDelegate::OnBeforeURLRequest(
+     net::URLRequest* request,
+     net::CompletionOnceCallback callback,
+     GURL* new_url) {
++
++#if defined(OS_ANDROID)
++  if (request) {
++    bool block = false, isValidUrl;
++
++    isValidUrl = request->url().is_valid();
++    std::string scheme = request->url().scheme();
++    if (isValidUrl && scheme.length()) {
++      std::transform(scheme.begin(), scheme.end(), scheme.begin(), ::tolower);
++        if ("http" != scheme && "https" != scheme) {
++          isValidUrl = false;
++        }
++    }
++    const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
++
++    bool adblock_enabled = false;
++    if (isValidUrl && info) {
++      const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter = info->GetWebContentsGetterForRequest();
++      content::WebContents* web_contents = web_contents_getter.Run();
++      if (web_contents) {
++        Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
++        //FIXME: this should not be called from the IO thread
++        const HostContentSettingsMap* content_settings = HostContentSettingsMapFactory::GetForProfile(profile);
++
++        if (content_settings) {
++          // check global value first
++          adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetDefaultContentSetting(ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS, NULL);
++
++          if (!adblock_enabled) {
++            // check per-site value
++            adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetContentSetting(request->url(), GURL(), ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS,
++                                                               std::string());
++          }
++        }
++      }
++
++      if (adblock_enabled
++        && content::RESOURCE_TYPE_MAIN_FRAME != info->GetResourceType()
++        && net::adblock_intercept(request->url(),
++                                request->initiator()->host(),
++                                info->GetResourceType())) {
++        block = true;
++      }
++
++      if (block) {
++        if (content::RESOURCE_TYPE_IMAGE == info->GetResourceType()) {
++          *new_url = GURL(TRANSPARENT1PXGIF);
++        } else {
++          *new_url = GURL("");
++        }
++        return net::ERR_BLOCKED_BY_ADMINISTRATOR;
++      }
++    } // valid URL and info
++  } // request
++#endif // OS_ANDROID
++
+   extensions_delegate_->ForwardStartRequestStatus(request);
+ 
+   return extensions_delegate_->NotifyBeforeURLRequest(
+       request, std::move(callback), new_url);
+ }
+ 
++#undef TRANSPARENT1PXGIF
++
+ int ChromeNetworkDelegate::OnBeforeStartTransaction(
+     net::URLRequest* request,
+     net::CompletionOnceCallback callback,
+diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+--- a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
++++ b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+@@ -19,6 +19,7 @@
+ #include "components/history/core/browser/history_service.h"
+ #include "components/keyed_service/core/service_access_type.h"
+ #include "url/gurl.h"
++#include "net/url_request/adblock_intercept.h"
+ 
+ namespace {
+ 
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
++++ b/net/BUILD.gn
+@@ -1731,6 +1731,13 @@ component("net") {
+       "url_request/websocket_handshake_userdata_key.h",
+     ]
+ 
++    if (is_android) {
++      sources += [
++        "url_request/adblock_intercept.cc",
++        "url_request/adblock_intercept.h"
++      ]
++    }
++
+     if (enable_reporting) {
+       sources += [
+         "network_error_logging/network_error_logging_delegate.cc",
+diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/adblock_intercept.cc
+@@ -0,0 +1,341 @@
++/*
++    This file is part of Bromite.
++
++    Bromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Bromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++#include "url/gurl.h"
++
++#ifdef ADB_TESTER
++#include <cstddef>
++#include <cstdlib>
++#include <string.h>
++
++#include "log.h"
++#include <tld.h>
++
++#else
++
++#include "content/public/common/resource_type.h"
++#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
++#include <android/log.h>
++
++#endif
++
++#include "net/url_request/adblock_entries.h"
++
++namespace net {
++
++const char *LOG_TAG = "Bromite";
++
++#ifdef ADB_TESTER
++int adblock_rules_count() { return ADBLOCK_ENTRY_COUNT; }
++#endif
++
++// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
++// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
++// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
++// string in |tld|, if specified and the |host| can be parsed.
++static bool is_first_party(char *l_host, char *l_url_host) {
++  size_t tld_length;
++
++#ifdef ADB_TESTER
++  char *found_tld;
++
++  if (TLD_SUCCESS != tld_get_z(l_host, &found_tld))
++    return false;
++  tld_length = strlen(found_tld);
++  if (tld_length == 0)
++    return false;
++#else
++  tld_length = net::registry_controlled_domains::GetCanonicalHostRegistryLength(
++      l_host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
++      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
++  if ((tld_length == 0) || (tld_length == std::string::npos))
++    return false;
++#endif
++
++  int len = strlen(l_host);
++  char *tld = l_host + len - tld_length;
++
++  // Removes any subdomain from origin host.
++  int i = len - tld_length - 2, top_i = i;
++  if (i < 0) {
++    return false;
++  }
++  char *domain = l_host;
++  for (; i >= 0; i--) {
++    if (l_host[i] == '.') {
++      int p_len = top_i - i;
++      // skip "co" in "co.uk", "org" in "org.uk"
++      if (p_len <= 3) {
++        tld -= p_len + 1;
++        continue;
++      }
++
++      // segment is long enough, accept it at as a domain
++      domain = l_host + i;
++      len -= i;
++      break;
++    }
++  }
++
++#ifdef ADBLOCK_LOG
++  __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
++                      "%s: extracted domain suffix: \"%s\" (TLD=\"%s\")",
++                      l_host, domain, tld);
++#endif
++
++  // Check if supplied URL host matches, including the dot.
++  int b_len = strlen(l_url_host);
++  if (b_len < len) {
++    return false;
++  }
++  for (int i = 0; i < len; i++) {
++    if (l_url_host[b_len - 1 - i] != domain[len - 1 - i])
++      return false;
++  }
++
++  // pass with flying colors
++  return true;
++}
++
++static char *strtolower(const char *str) {
++  int len = strlen(str);
++  char *ret = (char *)malloc(len + 1);
++  ret[len] = '\0';
++  for (int i = 0; i < len; i++) {
++    if ((65 <= str[i]) && (str[i] <= 90)) {
++      ret[i] = str[i] + 32;
++    } else {
++      ret[i] = str[i];
++    }
++  }
++  return ret;
++}
++
++static char *strtosep(const char *str) {
++  int len = strlen(str);
++  char *ret = (char *)malloc(len + 3);
++  ret[0] = '^';
++  ret[len + 1] = '^';
++  ret[len + 2] = '\0';
++  for (int i = 0; i < len; i++) {
++    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') ||
++        (str[i] == '&') || (str[i] == '=')) {
++      ret[i + 1] = '^';
++    } else {
++      ret[i + 1] = str[i];
++    }
++  }
++  return ret;
++}
++
++static bool url_matches(const char *c_url, char *c_url_sep, char *c_url_lower,
++                        char *c_url_lower_sep, adblock_entry *entry) {
++  bool match = false;
++  // select comparison string based on case and separator presence (separator
++  // takes some shortcuts)
++  bool match_case = ((entry->flags & ADBLOCK_FLAG_MATCH_CASE) != 0);
++  bool match_separator = ((entry->flags & ADBLOCK_FLAG_HAS_SEPARATOR) != 0);
++  const char *match_url =
++      match_case ? (match_separator ? c_url_sep : c_url)
++                 : (match_separator ? c_url_lower_sep : c_url_lower);
++
++#ifdef ADBLOCK_LOG_MORE
++  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[case:%d][sep:%d][%s]",
++                      match_case, match_separator, match_url);
++#endif
++  // check for all match parts at >= position of last match
++  const char *last = match_url;
++  for (int m = 0; const char *url_match = entry->matches[m]; m++) {
++    bool is_last_match = entry->matches[m + 1] == NULL;
++    const char *pos = strstr(last, url_match);
++    match = (pos != NULL);
++
++#ifdef ADBLOCK_LOG_MORE
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s][found:%d][match:%d]",
++                        entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
++#endif
++    // check if the url starts with the first match part
++    if (match && (m == 0) && ((entry->flags & ADBLOCK_FLAG_MATCH_BEGIN) != 0) &&
++        (pos != match_url))
++      match = false;
++
++    // check if the url ends with the last match part
++    if (match && is_last_match &&
++        ((entry->flags & ADBLOCK_FLAG_MATCH_END) != 0) &&
++        (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])]))
++      match = false;
++
++    // check domain match
++    if (match && (m == 0) &&
++        ((entry->flags & ADBLOCK_FLAG_MATCH_DOMAIN) != 0) &&
++        (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') &&
++        (pos[-1] != '/'))
++      match = false;
++
++    // short circuit
++    if (!match)
++      break;
++  }
++  return match;
++}
++
++bool url_match_domain(adblock_entry *entry, const std::string &origin_host) {
++  bool match_domain = true;
++  // check for a negative domain match
++  if (entry->domains_skip) {
++    if (origin_host.empty()) {
++      // skip this rule, cannot match on domain
++      return false;
++    }
++    for (int d = 0; const char *domain = entry->domains_skip[d]; d++) {
++      if (domain == origin_host) {
++        match_domain = false;
++        break;
++      }
++    }
++  }
++
++  // check for a required positive domain match
++  if (entry->domains) {
++    if (origin_host.empty()) {
++      // skip this rule, cannot match on domain
++      return false;
++    }
++    for (int d = 0; const char *domain = entry->domains[d]; d++) {
++      if (domain != origin_host) {
++        match_domain = false;
++        break;
++      }
++    }
++  }
++  return match_domain;
++}
++
++static bool url_match_party(adblock_entry *entry, const GURL &url,
++                            const std::string &origin_host, bool &checked_fp,
++                            bool &fp) {
++  bool wanted_fp;
++  if ((entry->flags & ADBLOCK_FLAG_THIRD_PARTY) != 0) {
++    wanted_fp = false;
++  } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) {
++    wanted_fp = true;
++  } else {
++    // no-op
++    return true;
++  }
++
++  if (origin_host.empty()) {
++    // cannot match this rule, no origin host to determine first/third party
++    return false;
++  }
++
++#ifdef ADB_TESTER
++//__android_log_print(ANDROID_LOG_INFO, LOG_TAG, "matchFirst=%d matchThird=%d",
++// matchFirstParty, matchThirdParty);
++#endif
++  if (!checked_fp) {
++    // lower-case version
++    char *l_host = strtolower(origin_host.c_str()),
++         *l_url_host = strtolower(url.host().c_str());
++
++    // is the URL a first-party to the current page's host?
++    fp = is_first_party(l_host, l_url_host);
++
++    checked_fp = true;
++#ifdef ADB_TESTER
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
++                        "is_first_party(\"%s\", \"%s\") = %s", l_host,
++                        l_url_host, fp ? "true" : "false");
++#endif
++    free(l_host);
++    free(l_url_host);
++  }
++
++  return fp == wanted_fp;
++}
++
++int adblock_intercept(const GURL &url, const std::string &origin_host
++#ifndef ADB_TESTER
++, content::ResourceType resource_type
++#endif
++) {
++  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
++    const char *c_url = url.spec().c_str();
++    char *c_url_lower = strtolower(c_url);
++    char *c_url_sep = strtosep(c_url);
++    char *c_url_lower_sep = strtosep(c_url_lower);
++
++#ifdef ADBLOCK_LOG
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s with host '%s'] [%s]",
++                        c_url, url.host().c_str(), origin_host.c_str());
++#endif
++
++    bool checked_fp = false, fp = false;
++
++    bool intercept = false;
++    for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) {
++      adblock_entry *entry = &ADBLOCK_ENTRIES[i];
++
++      // no use checking rules when we're intercepting, or exceptions when not
++      bool check =
++          (!intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) == 0)) ||
++          (intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) != 0));
++      if (!check)
++        continue;
++
++      // first check for domain matches, a quick branch out if matching
++      if (!url_match_domain(entry, origin_host))
++        continue;
++
++      // check on the URL matcher
++      if (!url_matches(c_url, c_url_sep, c_url_lower, c_url_lower_sep, entry))
++        continue;
++
++      // finally check first/third-party
++      if (!url_match_party(entry, url, origin_host, checked_fp, fp))
++        continue;
++
++#ifdef ADBLOCK_LOG
++      if (!intercept) {
++        __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
++                            "--> intercept (#%d: \"%s\") (%x)", i,
++                            entry->matches[0], entry->flags);
++      } else {
++        __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "--> pass (%d) (#%d)", i,
++                            entry->flags);
++      }
++#endif
++      intercept = !intercept;
++    } // for each entry
++
++    free(c_url_sep);
++    free(c_url_lower);
++    free(c_url_lower_sep);
++
++    if (intercept) {
++#ifdef ADBLOCK_LOG
++      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked");
++#endif
++      return 1;
++    }
++#ifdef ADBLOCK_LOG
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass");
++#endif
++  }
++  return 0;
++}
++
++} // namespace net
+diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/adblock_intercept.h
+@@ -0,0 +1,41 @@
++/*
++    This file is part of Bromite.
++
++    Bromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Bromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
++#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
++#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
++
++#include "url/gurl.h"
++
++#ifndef ADB_TESTER
++#include "content/public/common/resource_type.h"
++#endif
++
++namespace net {
++
++#ifdef ADB_TESTER
++int adblock_rules_count();
++#endif
++
++int adblock_intercept(const GURL &url, const std::string &origin_host
++#ifndef ADB_TESTER
++, content::ResourceType resource_type
++#endif
++);
++
++} // namespace net
++
++#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
+-- 
+2.11.0
+

build/patches/Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch

@@ -1,84 +1,44 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sat, 24 Mar 2018 05:18:03 +0100
-Subject: Canvas: fingerprinting mitigations for image data, font metrics and
- webGL
+Subject: Canvas: fingerprinting mitigations for image data and webGL
 
-Disable webGL renderer info, add shuffling to TextMetrics.
-Additionally, the color data returned by ToBlob, ToDataURL and getImageData
-will contain randomly manipulated pixels (maximum 10) that slightly
-change the color of the R,G,B components without a visible effect.
+Disable webGL renderer info and modify the color data returned by ToBlob,
+ToDataURL and getImageData so that it will contain randomly manipulated
+pixels (maximum 20) that slightly change the color of the R,G,B components
+without a visible effect.
 
 Credits to Slaviro (https://github.com/Slaviro) for coming up with a better
 approach to change color components.
 ---
- .../renderer/core/html/canvas/text_metrics.cc      |  20 +++
- .../blink/renderer/core/html/canvas/text_metrics.h |   2 +
- .../canvas/canvas2d/canvas_rendering_context_2d.cc |   6 +-
+ .../canvas/canvas2d/canvas_rendering_context_2d.cc |   4 +-
  .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
- .../platform/graphics/image_data_buffer.cc         |   4 +
- .../platform/graphics/static_bitmap_image.cc       | 151 +++++++++++++++++++++
+ third_party/blink/renderer/platform/BUILD.gn       |   4 +-
+ .../platform/graphics/image_data_buffer.cc         |   5 +
+ .../platform/graphics/static_bitmap_image.cc       | 156 +++++++++++++++++++++
  .../platform/graphics/static_bitmap_image.h        |   2 +
- 7 files changed, 186 insertions(+), 3 deletions(-)
+ 6 files changed, 169 insertions(+), 6 deletions(-)
 
-diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
---- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-@@ -47,6 +47,26 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
-   return 0;
- }
- 
-+void TextMetrics::Shuffle(const double amt) {
-+  double adjusted = 1 + amt;
-+
-+  // x-direction
-+  width_ *= adjusted;
-+  actual_bounding_box_left_ *= adjusted;
-+  actual_bounding_box_right_ *= adjusted;
-+
-+  // y-direction
-+  font_bounding_box_ascent_ *= adjusted;
-+  font_bounding_box_descent_ *= adjusted;
-+  actual_bounding_box_ascent_ *= adjusted;
-+  actual_bounding_box_descent_ *= adjusted;
-+  em_height_ascent_ *= adjusted;
-+  em_height_descent_ *= adjusted;
-+  hanging_baseline_ *= adjusted;
-+  alphabetic_baseline_ *= adjusted;
-+  ideographic_baseline_ *= adjusted;
-+}
-+
- void TextMetrics::Update(const Font& font,
-                          const TextDirection& direction,
-                          const TextBaseline& baseline,
-diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
---- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
-+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
-@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
- 
-   static float GetFontBaseline(const TextBaseline&, const FontMetrics&);
- 
-+  void Shuffle(const double amt);
-+
-  private:
-   void Update(const Font&,
-               const TextDirection&,
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -773,8 +773,12 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
-   else
-     direction = ToTextDirection(GetState().GetDirection(), canvas());
+@@ -33,8 +33,6 @@
  
--  return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
-+  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+ #include "third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h"
+ 
+-#include "base/rand_util.h"
+-
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/public/platform/task_type.h"
+ #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
+@@ -788,7 +786,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
                               GetState().GetTextAlign(), text);
-+
-+  textMetrics->Shuffle(canvas()->GetDocument().GetShuffleFactorX());
-+
-+  return textMetrics;
- }
  
- void CanvasRenderingContext2D::DrawTextInternal(
+   // scale text metrics by 3/1000000th
+-  auto shuffleFactor = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  auto shuffleFactor = 1 + (canvas()->GetDocument().GetShuffleFactorX() - 0.5) * 0.000003;
+   textMetrics->Shuffle(shuffleFactor);
+ 
+   return textMetrics;
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
@@ -96,53 +56,63 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
  }
  
  const char* WebGLDebugRendererInfo::ExtensionName() {
+diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
+--- a/third_party/blink/renderer/platform/BUILD.gn
++++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -1432,7 +1432,9 @@ jumbo_component("platform") {
+     "//third_party/blink/renderer:non_test_config",
+   ]
+ 
+-  include_dirs = []
++  include_dirs = [
++    "//third_party/skia/include/private", # For shuffler in graphics/static_bitmap_image.cc
++  ]
+ 
+   public_deps = [
+     ":blink_platform_public_deps",
 diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 --- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 +++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-@@ -35,6 +35,7 @@
+@@ -35,6 +35,8 @@
  #include <memory>
  
  #include "base/memory/ptr_util.h"
 +#include "base/rand_util.h"
++#include "base/logging.h"
  #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
  #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
-@@ -121,6 +122,9 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type,
-                                   Vector<unsigned char>* encoded_image) const {
+ #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+@@ -128,6 +130,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
+                                           const SkPixmap& pixmap) const {
    DCHECK(is_valid_);
  
 +  // shuffle subchannel color data within the pixmap
 +  StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
 +
-   if (mime_type == "image/jpeg") {
+   if (mime_type == kMimeTypeJpeg) {
      SkJpegEncoder::Options options;
      options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
 diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
-@@ -4,6 +4,7 @@
+@@ -4,6 +4,8 @@
  
  #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
  
 +#include "base/rand_util.h"
++#include "base/logging.h"
+ #include "base/numerics/checked_math.h"
  #include "gpu/command_buffer/client/gles2_interface.h"
- #include "skia/ext/texture_handle.h"
  #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
-@@ -16,6 +17,7 @@
+@@ -15,6 +17,7 @@
  #include "third_party/skia/include/core/SkCanvas.h"
  #include "third_party/skia/include/core/SkImage.h"
  #include "third_party/skia/include/core/SkPaint.h"
 +#include "third_party/skia/src/core/SkColorData.h"
+ #include "third_party/skia/include/core/SkSurface.h"
  #include "third_party/skia/include/gpu/GrContext.h"
  
- namespace blink {
-@@ -149,15 +151,164 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
-       rect.Width(), rect.Height(), color_type, kUnpremul_SkAlphaType,
-       color_params.GetSkColorSpaceForSkSurfaces());
-   sk_sp<SkImage> sk_image = src_image->PaintImageForCurrentFrame().GetSkImage();
-+
-   bool read_pixels_successful = sk_image->readPixels(
-       info, result.Data(), info.minRowBytes(), rect.X(), rect.Y());
+@@ -176,10 +179,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
    DCHECK(read_pixels_successful ||
           !sk_image->bounds().intersect(SkIRect::MakeXYWH(
               rect.X(), rect.Y(), info.width(), info.height())));
@@ -161,8 +131,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
 +  auto w = info.width() - srcX, h = info.height() - srcY;
 +
-+  // skip tiny images
-+  if (w + h <= 16) {
++  // skip tiny images; info.width()/height() can also be 0
++  if ((w < 8) || (h < 8)) {
 +    return;
 +  }
 +
@@ -171,8 +141,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +
 +  // cap maximum pixels to change
 +  auto pixels = (w + h) / 128;
-+  if (pixels > 10) {
-+    pixels = 10;
++  if (pixels > 20) {
++    pixels = 20;
 +  } else if (pixels < 2) {
 +    pixels = 2;
 +  }
@@ -180,6 +150,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +  auto colorType = info.colorType();
 +  auto fRowBytes = info.minRowBytes(); // stride
 +
++  DLOG(INFO) << "BRM: ShuffleSubchannelColorData() w=" << w << " h=" << h << " colorType=" << colorType << " fRowBytes=" << fRowBytes;
++
 +  // second random number (for y/height)
 +  double shuffleY = base::RandDouble();
 +
@@ -189,7 +161,9 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +    int x = currentW * shuffleX, y = currentH * shuffleY;
 +
 +    // calculate randomisation amounts for each RGB component
-+    auto shuffleR = (uint8_t)base::RandInt(0, 4), shuffleG = (uint8_t)base::RandInt(0, 4), shuffleB = (uint8_t)base::RandInt(0, 4);
++    uint8_t shuffleR = base::RandInt(0, 4);
++    uint8_t shuffleG = (shuffleR + x) % 4;
++    uint8_t shuffleB = (shuffleG + y) % 4;
 +
 +    // manipulate pixel data to slightly change the R, G, B components
 +    switch (colorType) {
@@ -278,6 +252,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +      break;
 +      default:
 +         // the remaining formats are not expected to be used in Chromium
++         LOG(WARNING) << "BRM: ShuffleSubchannelColorData(): Ignoring pixel format";
 +         return;
 +    }
 +
@@ -314,5 +289,5 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
  
    // Methods overridden by all sub-classes
 -- 
-2.7.4
+2.11.0
 

build/patches/Change-default-homepage-to-new-tab-page.patch

@@ -32,5 +32,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
  
      /**
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-NTP-remote-suggestions-by-default.patch

@@ -9,8 +9,8 @@ Subject: Disable NTP remote suggestions by default
 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -41,16 +41,16 @@ const base::Feature kArticleSuggestionsExpandableHeader{
-     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -35,13 +35,13 @@ const base::Feature* const kAllFeatures[] = {
+     &kRemoteSuggestionsBackendFeature};
  
  const base::Feature kArticleSuggestionsFeature{
 -    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -20,15 +20,12 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 -    "NTPBookmarkSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "NTPBookmarkSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
  
- const base::Feature kRecentOfflineTabSuggestionsFeature{
-     "NTPOfflinePageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
  const base::Feature kIncreasedVisibility{"NTPSnippetsIncreasedVisibility",
 -                                         base::FEATURE_ENABLED_BY_DEFAULT};
 +                                         base::FEATURE_DISABLED_BY_DEFAULT};
  
- const base::Feature kPhysicalWebPageSuggestionsFeature{
-     "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kForeignSessionsSuggestionsFeature{
+     "NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-Omaha-update-checks.patch

@@ -9,7 +9,7 @@ Subject: Disable Omaha update checks
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -132,7 +132,7 @@ public class OmahaBase {
+@@ -134,7 +134,7 @@ public class OmahaBase {
  
      /** See {@link #sIsDisabled}. */
      static boolean isDisabled() {
@@ -19,5 +19,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase
  
      /**
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-WebRTC-by-default.patch

@@ -9,9 +9,9 @@ Subject: Disable WebRTC by default
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -89,10 +89,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -85,10 +85,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+                                 false);
  #endif
- #if BUILDFLAG(ENABLE_WEBRTC)
    // TODO(guoweis): Remove next 2 options at M50.
 -  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
 -  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
@@ -21,8 +21,8 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 -                               content::kWebRTCIPHandlingDefault);
 +                               content::kWebRTCIPHandlingDisableNonProxiedUdp);
    registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
- #endif
+   registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
  
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-ads-metrics-by-default.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Jul 2018 11:17:53 +0200
+Subject: Disable ads metrics by default
+
+---
+ chrome/common/chrome_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
++++ b/chrome/common/chrome_features.cc
+@@ -15,7 +15,7 @@ namespace features {
+ // All features in alphabetical order.
+ 
+ // Enables Ads Metrics.
+-const base::Feature kAdsFeature{"AdsMetrics", base::FEATURE_ENABLED_BY_DEFAULT};
++const base::Feature kAdsFeature{"AdsMetrics", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ #if defined(OS_ANDROID)
+ const base::Feature kAllowAutoplayUnmutedInWebappManifestScope{
+-- 
+2.11.0
+

build/patches/Disable-data-saver.patch

@@ -11,7 +11,7 @@ Subject: Disable data saver
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -140,7 +140,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -141,7 +141,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
          boolean notifyAdapter = false;
          // An optional Data Saver page.
          if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -149,6 +149,7 @@ public class DataReductionProxySettings {
+@@ -131,6 +131,7 @@ public class DataReductionProxySettings {
          // DataReductionProxySettings is a singleton that lives forever and there's no clean
          // shutdown of Chrome on Android
          mNativeDataReductionProxySettings = nativeInit();
@@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D
      }
  
      /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -171,6 +172,7 @@ public class DataReductionProxySettings {
+@@ -153,6 +154,7 @@ public class DataReductionProxySettings {
       * data reduction statistics if this is the first time the SPDY proxy has been enabled.
       */
      public void setDataReductionProxyEnabled(Context context, boolean enabled) {
@@ -51,5 +51,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
  
      /**
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-fetching-of-all-field-trials.patch

@@ -0,0 +1,70 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 8 Jul 2018 18:16:34 +0200
+Subject: Disable fetching of all field trials
+
+---
+ .../src/org/chromium/chrome/browser/ChromeFeatureList.java   | 12 +++---------
+ components/variations/service/variations_service.cc          | 12 +-----------
+ 2 files changed, 4 insertions(+), 20 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+@@ -103,9 +103,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static int getFieldTrialParamByFeatureAsInt(
+             String featureName, String paramName, int defaultValue) {
+-        if (sTestFeatures != null) return defaultValue;
+-        assert isInitialized();
+-        return nativeGetFieldTrialParamByFeatureAsInt(featureName, paramName, defaultValue);
++        return defaultValue;
+     }
+ 
+     /**
+@@ -122,9 +120,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static double getFieldTrialParamByFeatureAsDouble(
+             String featureName, String paramName, double defaultValue) {
+-        if (sTestFeatures != null) return defaultValue;
+-        assert isInitialized();
+-        return nativeGetFieldTrialParamByFeatureAsDouble(featureName, paramName, defaultValue);
++        return defaultValue;
+     }
+ 
+     /**
+@@ -141,9 +137,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static boolean getFieldTrialParamByFeatureAsBoolean(
+             String featureName, String paramName, boolean defaultValue) {
+-        if (sTestFeatures != null) return defaultValue;
+-        assert isInitialized();
+-        return nativeGetFieldTrialParamByFeatureAsBoolean(featureName, paramName, defaultValue);
++        return defaultValue;
+     }
+ 
+     // Alphabetical:
+diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
+--- a/components/variations/service/variations_service.cc
++++ b/components/variations/service/variations_service.cc
+@@ -232,17 +232,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+ // Variations seed fetching is only enabled in official Chrome builds, if a URL
+ // is specified on the command line, and for testing.
+ bool IsFetchingEnabled() {
+-#if !defined(GOOGLE_CHROME_BUILD)
+-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kVariationsServerURL) &&
+-      !g_should_fetch_for_testing) {
+-    DVLOG(1)
+-        << "Not performing repeated fetching in unofficial build without --"
+-        << switches::kVariationsServerURL << " specified.";
+-    return false;
+-  }
+-#endif
+-  return true;
++  return false;
+ }
+ 
+ std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
+-- 
+2.11.0
+

build/patches/Disable-generic-sensor-API-by-default.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 22 Oct 2018 21:14:57 +0200
+Subject: Disable generic sensor API by default
+
+---
+ services/device/public/cpp/device_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/device/public/cpp/device_features.cc b/services/device/public/cpp/device_features.cc
+--- a/services/device/public/cpp/device_features.cc
++++ b/services/device/public/cpp/device_features.cc
+@@ -9,7 +9,7 @@ namespace features {
+ // Enables sensors based on Generic Sensor API:
+ // https://w3c.github.io/sensors/
+ const base::Feature kGenericSensor{"GenericSensor",
+-                                   base::FEATURE_ENABLED_BY_DEFAULT};
++                                   base::FEATURE_DISABLED_BY_DEFAULT};
+ // Enables an extra set of concrete sensors classes based on Generic Sensor API,
+ // which expose previously unexposed platform features, e.g. ALS or Magnetometer
+ const base::Feature kGenericSensorExtraClasses{
+-- 
+2.11.0
+

build/patches/Disable-metrics-on-all-I-O-threads.patch

@@ -9,7 +9,7 @@ Subject: Disable metrics on all I/O threads
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -964,7 +964,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
+@@ -873,7 +873,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
  
  bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -19,5 +19,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profile
  
  chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-plugins-enumeration.patch

@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1175,10 +1175,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+@@ -1294,10 +1294,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {
@@ -21,7 +21,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 +  return nullptr;
  }
  
- DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
+ void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) {
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-promos-displayed-in-bookmarks-manager.patch

@@ -0,0 +1,169 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 10 Nov 2018 17:20:21 +0100
+Subject: Disable promos displayed in bookmarks manager
+
+Remove personalized signin promo view from
+bookmarks, never reach signin thresholds.
+---
+ .../personalized_signin_promo_view_bookmarks.xml   | 30 ----------------------
+ .../browser/bookmarks/BookmarkItemsAdapter.java    | 23 ++---------------
+ .../browser/signin/SigninPromoController.java      | 19 ++------------
+ chrome/android/java_sources.gni                    |  1 -
+ 4 files changed, 4 insertions(+), 69 deletions(-)
+ delete mode 100644 chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
+
+diff --git a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml b/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
+deleted file mode 100644
+--- a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
++++ /dev/null
+@@ -1,30 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+-     Use of this source code is governed by a BSD-style license that can be
+-     found in the LICENSE file. -->
+-
+-<org.chromium.chrome.browser.signin.PersonalizedSigninPromoView
+-    xmlns:android="http://schemas.android.com/apk/res/android"
+-    android:id="@+id/signin_promo_view_container"
+-    android:layout_width="match_parent"
+-    android:layout_height="wrap_content"
+-    android:layout_margin="16dp"
+-    android:background="@drawable/hairline_border_card_background"
+-    android:gravity="center_horizontal"
+-    android:orientation="vertical"
+-    android:paddingBottom="12dp"
+-    android:paddingTop="14dp">
+-
+-    <FrameLayout
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_marginBottom="12dp"
+-        android:layout_marginEnd="12dp"
+-        android:layout_marginStart="12dp">
+-
+-        <include layout="@layout/personalized_signin_promo_view_header"/>
+-    </FrameLayout>
+-
+-    <include layout="@layout/personalized_signin_promo_view_body"/>
+-
+-</org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>
+\ No newline at end of file
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+@@ -57,7 +57,6 @@ class BookmarkItemsAdapter
+ 
+     private BookmarkDelegate mDelegate;
+     private Context mContext;
+-    private BookmarkPromoHeader mPromoHeaderManager;
+     private String mSearchText;
+     private BookmarkId mCurrentFolder;
+ 
+@@ -211,9 +210,9 @@ class BookmarkItemsAdapter
+ 
+         switch (viewType) {
+             case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                return mPromoHeaderManager.createPersonalizedSigninPromoHolder(parent);
++                return null;
+             case ViewType.SYNC_PROMO:
+-                return mPromoHeaderManager.createSyncPromoHolder(parent);
++                return null;
+             case ViewType.FOLDER:
+                 BookmarkFolderRow folder = (BookmarkFolderRow) LayoutInflater.from(
+                         parent.getContext()).inflate(R.layout.bookmark_folder_row, parent, false);
+@@ -234,8 +233,6 @@ class BookmarkItemsAdapter
+     public void onBindViewHolder(ViewHolder holder, int position) {
+         switch (holder.getItemViewType()) {
+             case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                PersonalizedSigninPromoView view = (PersonalizedSigninPromoView) holder.itemView;
+-                mPromoHeaderManager.setupPersonalizedSigninPromo(view);
+                 break;
+             case ViewType.SYNC_PROMO:
+                 break;
+@@ -254,7 +251,6 @@ class BookmarkItemsAdapter
+     public void onViewRecycled(ViewHolder holder) {
+         switch (holder.getItemViewType()) {
+             case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                mPromoHeaderManager.detachPersonalizePromoView();
+                 break;
+             default:
+                 // Other view holders don't have special recycling code.
+@@ -289,7 +285,6 @@ class BookmarkItemsAdapter
+             }
+         };
+ 
+-        mPromoHeaderManager = new BookmarkPromoHeader(mContext, promoHeaderChangeAction);
+         populateTopLevelFoldersList();
+         notifyDataSetChanged();
+     }
+@@ -300,7 +295,6 @@ class BookmarkItemsAdapter
+         mDelegate.removeUIObserver(this);
+         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
+         mDelegate = null;
+-        mPromoHeaderManager.destroy();
+     }
+ 
+     @Override
+@@ -367,19 +361,6 @@ class BookmarkItemsAdapter
+         if (currentUIState == BookmarkUIState.STATE_SEARCHING) return;
+ 
+         assert currentUIState == BookmarkUIState.STATE_FOLDER : "Unexpected UI state";
+-
+-        switch (mPromoHeaderManager.getPromoState()) {
+-            case BookmarkPromoHeader.PromoState.PROMO_NONE:
+-                return;
+-            case BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED:
+-                mPromoHeaderSection.add(ViewType.PERSONALIZED_SIGNIN_PROMO);
+-                return;
+-            case BookmarkPromoHeader.PromoState.PROMO_SYNC:
+-                mPromoHeaderSection.add(ViewType.SYNC_PROMO);
+-                return;
+-            default:
+-                assert false : "Unexpected value for promo state!";
+-        }
+     }
+ 
+     private void populateTopLevelFoldersList() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
+@@ -77,23 +77,8 @@ public class SigninPromoController {
+      */
+     public static boolean hasNotReachedImpressionLimit(@AccessPoint int accessPoint) {
+         SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
+-        switch (accessPoint) {
+-            case SigninAccessPoint.BOOKMARK_MANAGER:
+-                return sharedPreferences.getInt(SIGNIN_PROMO_IMPRESSIONS_COUNT_BOOKMARKS, 0)
+-                        < MAX_IMPRESSIONS_BOOKMARKS;
+-            case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS:
+-                // There is no impression limit for NTP content suggestions.
+-                return true;
+-            case SigninAccessPoint.RECENT_TABS:
+-                // There is no impression limit for Recent Tabs.
+-                return true;
+-            case SigninAccessPoint.SETTINGS:
+-                return sharedPreferences.getInt(SIGNIN_PROMO_IMPRESSIONS_COUNT_SETTINGS, 0)
+-                        < MAX_IMPRESSIONS_SETTINGS;
+-            default:
+-                assert false : "Unexpected value for access point: " + accessPoint;
+-                return false;
+-        }
++        // never show anything
++        return true;
+     }
+ 
+     /**
+diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
+--- a/chrome/android/java_sources.gni
++++ b/chrome/android/java_sources.gni
+@@ -140,7 +140,6 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java",
+   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java",
+   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java",
+-  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java",
+   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java",
+   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java",
+   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
+-- 
+2.11.0
+

build/patches/Disable-references-to-fonts.googleapis.com.patch

@@ -59,5 +59,5 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
  body,
  table,
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-signin-and-data-saver-preferences.patch

@@ -4,71 +4,67 @@ Subject: Disable signin and data saver preferences
 
 Never show the data saver promo snackbar
 ---
- chrome/android/java/res/xml/main_preferences.xml   |  8 +++---
+ chrome/android/java/res/xml/main_preferences.xml   |  9 -----
  .../chromium/chrome/browser/ChromeActivity.java    |  6 ++--
- .../browser/preferences/MainPreferences.java       | 32 ++++++++++++----------
- 3 files changed, 26 insertions(+), 20 deletions(-)
+ .../browser/preferences/MainPreferences.java       | 39 +++++++++++-----------
+ 3 files changed, 24 insertions(+), 30 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -6,10 +6,10 @@
- <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-     android:orderingFromXml="false">
- 
--    <org.chromium.chrome.browser.preferences.SignInPreference
-+    <!-- org.chromium.chrome.browser.preferences.SignInPreference
-         android:key="sign_in"
+@@ -10,10 +10,6 @@
+         android:key="account_section"
          android:order="0"
+         android:title="@string/prefs_section_account"/>
+-    <org.chromium.chrome.browser.preferences.SignInPreference
+-        android:key="sign_in"
+-        android:order="1"
 -        android:title="@string/sign_in_to_chrome"/>
-+        android:title="@string/sign_in_to_chrome"/-->
- 
-     <PreferenceCategory
-         android:key="basics_section"
-@@ -70,11 +70,11 @@
-         android:key="languages"
-         android:order="12"
-         android:title="@string/prefs_languages"/>
--    <org.chromium.chrome.browser.preferences.ChromeBasePreference
-+    <!-- org.chromium.chrome.browser.preferences.ChromeBasePreference
-         android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
-         android:key="data_reduction"
-         android:order="13"
--        android:title="@string/data_reduction_title"/>
-+        android:title="@string/data_reduction_title"/-->
      <org.chromium.chrome.browser.preferences.ChromeBasePreference
+         android:fragment="org.chromium.chrome.browser.preferences.SyncAndServicesPreferences"
+         android:key="sync_and_services"
+@@ -85,11 +81,6 @@
+         android:order="15"
+         android:title="@string/prefs_languages"/>
+     <org.chromium.chrome.browser.preferences.ChromeBasePreference
+-        android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
+-        android:key="data_reduction"
+-        android:order="16"
+-        android:title="@string/data_reduction_title"/>
+-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
          android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
          android:key="downloads"
+         android:order="17"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -114,7 +114,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
+@@ -118,7 +118,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.share.ShareMenuActionHandler;
  import org.chromium.chrome.browser.snackbar.BottomContainer;
 -import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
 +//import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
- import org.chromium.chrome.browser.snackbar.DataUseSnackbarController;
  import org.chromium.chrome.browser.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
-@@ -255,7 +255,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+ import org.chromium.chrome.browser.sync.ProfileSyncService;
+@@ -263,7 +263,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+     protected ReaderModeManager mReaderModeManager;
      private SnackbarManager mSnackbarManager;
      private ModalDialogManager mModalDialogManager;
-     private DataUseSnackbarController mDataUseSnackbarController;
 -    private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
 +    //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
      private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate;
      private AppMenuHandler mAppMenuHandler;
      private ToolbarManager mToolbarManager;
-@@ -576,6 +576,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-                     mDataUseSnackbarController.showDataUseTrackingEndedBar();
-                 }
- 
+@@ -666,6 +666,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+         mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) {
+             @Override
+             public void didFirstVisuallyNonEmptyPaint(Tab tab) {
 +/*
-                 // Only alert about data savings once the first paint has happened. It doesn't make
-                 // sense to show a snackbar about savings when nothing has been displayed yet.
-                 if (DataReductionProxySettings.getInstance().isSnackbarPromoAllowed(tab.getUrl())) {
-@@ -588,6 +589,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+                 // Only alert about data savings once the first paint has happened. It
+                 // doesn't make sense to show a snackbar about savings when nothing has been
+                 // displayed yet.
+@@ -679,6 +680,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                              DataReductionProxySettings.getInstance()
                                      .getTotalHttpContentLengthSaved());
                  }
@@ -79,43 +75,41 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-@@ -18,9 +18,9 @@ import org.chromium.chrome.R;
+@@ -17,9 +17,9 @@ import org.chromium.base.VisibleForTesting;
+ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ChromeFeatureList;
- import org.chromium.chrome.browser.autofill.PersonalDataManager;
- import org.chromium.chrome.browser.contextual_suggestions.EnabledStateMonitor;
+ import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsEnabledStateUtils;
 -import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 +//import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 -import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
 +//import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
+ import org.chromium.chrome.browser.search_engines.TemplateUrl;
  import org.chromium.chrome.browser.search_engines.TemplateUrlService;
- import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
  import org.chromium.chrome.browser.signin.SigninManager;
-@@ -35,20 +35,20 @@ import java.util.Map;
-  */
+@@ -34,13 +34,11 @@ import java.util.Map;
  public class MainPreferences extends PreferenceFragment
          implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener {
+     public static final String PREF_ACCOUNT_SECTION = "account_section";
 -    public static final String PREF_SIGN_IN = "sign_in";
-+    //public static final String PREF_SIGN_IN = "sign_in";
-     public static final String PREF_AUTOFILL_SETTINGS = "autofill_settings";
+     public static final String PREF_SYNC_AND_SERVICES = "sync_and_services";
      public static final String PREF_SEARCH_ENGINE = "search_engine";
      public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
      public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions";
      public static final String PREF_HOMEPAGE = "homepage";
 -    public static final String PREF_DATA_REDUCTION = "data_reduction";
-+    //public static final String PREF_DATA_REDUCTION = "data_reduction";
      public static final String PREF_NOTIFICATIONS = "notifications";
      public static final String PREF_LANGUAGES = "languages";
      public static final String PREF_DOWNLOADS = "downloads";
+@@ -52,7 +50,6 @@ public class MainPreferences extends PreferenceFragment
  
      private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
      private final Map<String, Preference> mAllPreferences = new HashMap<>();
 -    private SignInPreference mSignInPreference;
-+    //private SignInPreference mSignInPreference;
  
      public MainPreferences() {
          setHasOptionsMenu(true);
-@@ -64,25 +64,29 @@ public class MainPreferences extends PreferenceFragment
+@@ -68,25 +65,29 @@ public class MainPreferences extends PreferenceFragment
      @Override
      public void onDestroy() {
          super.onDestroy();
@@ -146,16 +140,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
      }
  
      @Override
-@@ -98,7 +102,7 @@ public class MainPreferences extends PreferenceFragment
+@@ -99,16 +100,16 @@ public class MainPreferences extends PreferenceFragment
+         PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);
+         cachePreferences();
+ 
+-        if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
++/*        if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {
+             mSignInPreference.setOnStateChangedCallback(this::onSignInPreferenceStateChanged);
+-        } else {
++        } else */{
+             getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION));
+             getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES));
+         }
+ 
          setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
-         setManagedPreferenceDelegateForPreference(PREF_AUTOFILL_SETTINGS);
          setManagedPreferenceDelegateForPreference(PREF_SAVED_PASSWORDS);
 -        setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
 +        //setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
  
          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
              // If we are on Android O+ the Notifications preference should lead to the Android
-@@ -154,7 +158,7 @@ public class MainPreferences extends PreferenceFragment
+@@ -164,7 +165,7 @@ public class MainPreferences extends PreferenceFragment
              Preference preference = getPreferenceScreen().getPreference(index);
              mAllPreferences.put(preference.getKey(), preference);
          }
@@ -164,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
      }
  
      private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -163,12 +167,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -173,12 +174,6 @@ public class MainPreferences extends PreferenceFragment
      }
  
      private void updatePreferences() {
@@ -177,7 +182,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
          updateSearchEnginePreference();
  
          if (HomepageManager.shouldShowHomepageSetting()) {
-@@ -187,9 +185,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -201,9 +196,11 @@ public class MainPreferences extends PreferenceFragment
              removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS);
          }
  
@@ -189,7 +194,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
      }
  
      private Preference addPreferenceIfAbsent(String key) {
-@@ -260,9 +260,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -254,11 +251,11 @@ public class MainPreferences extends PreferenceFragment
+ 
+     private void onSignInPreferenceStateChanged() {
+         // Remove "Account" section header if the personalized sign-in promo is shown.
+-        if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) {
++//        if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) {
+             removePreferenceIfPresent(PREF_ACCOUNT_SECTION);
+-        } else {
++/*        } else {
+             addPreferenceIfAbsent(PREF_ACCOUNT_SECTION);
+-        }
++        }*/
+     }
+ 
+     // TemplateUrlService.LoadListener implementation.
+@@ -280,9 +277,11 @@ public class MainPreferences extends PreferenceFragment
                  if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) {
                      return PrefServiceBridge.getInstance().isRememberPasswordsManaged();
                  }
@@ -201,7 +221,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
                  if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
                      return TemplateUrlService.getInstance().isDefaultSearchManaged();
                  }
-@@ -280,11 +282,13 @@ public class MainPreferences extends PreferenceFragment
+@@ -296,11 +295,13 @@ public class MainPreferences extends PreferenceFragment
                      return prefs.isRememberPasswordsManaged()
                              && !prefs.isRememberPasswordsEnabled();
                  }
@@ -216,5 +236,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
                      return TemplateUrlService.getInstance().isDefaultSearchManaged();
                  }
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-signin-data-reduction-promos.patch

@@ -9,7 +9,7 @@ Subject: Disable signin/data reduction promos
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -562,7 +562,7 @@ public class ChromeTabbedActivity
+@@ -603,7 +603,7 @@ public class ChromeTabbedActivity
              // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
              //                might not have completed at this point and we could show multiple
              //                promos.
@@ -18,15 +18,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
              // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696
              boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
              if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
-@@ -581,7 +581,7 @@ public class ChromeTabbedActivity
-                 preferenceManager.setPromosSkippedOnFirstStart(true);
+@@ -621,7 +621,7 @@ public class ChromeTabbedActivity
+                         ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, true);
              }
  
 -            if (!isShowingPromo) {
 +            if (!isShowingPromo) */ {
-                 final Tracker tracker =
-                         TrackerFactory.getTrackerForProfile(Profile.getLastUsedProfile());
-                 tracker.addOnInitializedCallback(
+                 ToolbarButtonInProductHelpController.maybeShowColdStartIPH(this);
+             }
+ 
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-smooth-scrolling-on-Linux.patch

@@ -27,5 +27,5 @@ diff --git a/ui/gfx/animation/animation.cc b/ui/gfx/animation/animation.cc
  #endif
  
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-third-party-cookies-by-default.patch

@@ -10,7 +10,7 @@ author: Chad Miller <chad.miller@canonical.com>
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
+@@ -50,7 +50,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
  }
  
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-update-scheduler.patch

@@ -0,0 +1,33 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 27 Oct 2018 17:54:01 +0200
+Subject: Disable update scheduler
+
+---
+ .../chromium/chrome/browser/component_updater/UpdateScheduler.java | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+@@ -35,10 +35,7 @@ public class UpdateScheduler {
+ 
+     @CalledByNative
+     /* package */ static boolean isAvailable() {
+-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+-                || GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                           ContextUtils.getApplicationContext())
+-                == ConnectionResult.SUCCESS;
++        return false;
+     }
+ 
+     /* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
+@@ -108,4 +105,4 @@ public class UpdateScheduler {
+ 
+     private native void nativeOnStartTask(long nativeBackgroundTaskUpdateScheduler);
+     private native void nativeOnStopTask(long nativeBackgroundTaskUpdateScheduler);
+-}
+\ No newline at end of file
++}
+-- 
+2.11.0
+

build/patches/Disables-omission-of-URL-elements-in-Omnibox.patch

@@ -10,7 +10,7 @@ Disable all omissions (already shadowed by first flag)
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -402,12 +402,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+@@ -410,12 +410,12 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp,
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -26,9 +26,9 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 +const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
 +const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
 +const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
+ const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
  
  const FormatUrlType kFormatUrlOmitDefaults =
-     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
 -- 
-2.7.4
+2.11.0
 

build/patches/Do-not-grant-notifications-to-default-search-engine.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 10 Nov 2018 19:47:39 +0100
+Subject: Do not grant notifications to default search engine
+
+---
+ chrome/common/chrome_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
++++ b/chrome/common/chrome_features.cc
+@@ -296,7 +296,7 @@ const base::Feature kGeoLanguage{"GeoLanguage",
+ 
+ #if defined(OS_ANDROID)
+ const base::Feature kGrantNotificationsToDSE{"GrantNotificationsToDSE",
+-                                             base::FEATURE_ENABLED_BY_DEFAULT};
++                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif  // defined(OS_ANDROID)
+ 
+ #if defined (OS_CHROMEOS)
+-- 
+2.11.0
+

build/patches/Do-not-store-passwords-by-default.patch

@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -244,10 +244,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -363,10 +363,10 @@ void RecordParsingOnSavingDifference(
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -23,5 +23,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
    registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
                                 PrefRegistry::NO_REGISTRATION_FLAGS);
 -- 
-2.7.4
+2.11.0
 

build/patches/Enable-TLS-1.3-final-by-default.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 5 Nov 2018 09:39:50 +0100
+Subject: Enable TLS 1.3 (final) by default
+
+---
+ chrome/browser/ssl/ssl_config_service_manager_pref.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/ssl/ssl_config_service_manager_pref.cc b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
+--- a/chrome/browser/ssl/ssl_config_service_manager_pref.cc
++++ b/chrome/browser/ssl/ssl_config_service_manager_pref.cc
+@@ -180,7 +180,7 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
+   } else if (tls13_variant == "draft23") {
+     tls13_value = switches::kTLS13VariantDraft23;
+     version_value = switches::kSSLVersionTLSv13;
+-  } else if (tls13_variant == "final") {
++  } else if (tls13_variant == "final" || tls13_variant.empty()) {
+     tls13_value = switches::kTLS13VariantFinal;
+     version_value = switches::kSSLVersionTLSv13;
+   }
+-- 
+2.11.0
+

build/patches/Enable-history-requirement-of-user-gesture.patch

@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 2 Nov 2018 14:06:17 +0100
+Subject: Enable history requirement of user gesture
+
+Set #enable-history-entry-requires-user-gesture to enabled by default
+---
+ chrome/browser/about_flags.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1511,7 +1511,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-history-entry-requires-user-gesture",
+      flag_descriptions::kHistoryRequiresUserGestureName,
+      flag_descriptions::kHistoryRequiresUserGestureDescription, kOsAll,
+-     SINGLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)},
++     SINGLE_DISABLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)},
+     {"disable-pushstate-throttle",
+      flag_descriptions::kDisablePushStateThrottleName,
+      flag_descriptions::kDisablePushStateThrottleDescription, kOsAll,
+-- 
+2.11.0
+

build/patches/Fix-crash-when-accessing-page-info-site-settings.patch

@@ -9,7 +9,7 @@ Subject: Fix crash when accessing page info / site settings
 diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
 --- a/chrome/browser/permissions/permission_manager.cc
 +++ b/chrome/browser/permissions/permission_manager.cc
-@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+@@ -677,6 +677,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
    GURL canonical_requesting_origin =
        GetCanonicalOrigin(requesting_origin, embedding_origin);
    PermissionContextBase* context = GetPermissionContext(permission);
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/p
        render_frame_host, canonical_requesting_origin.GetOrigin(),
        embedding_origin.GetOrigin());
 -- 
-2.7.4
+2.11.0
 

build/patches/Hide-send-reports-checkbox.patch

@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 12 Jun 2018 15:03:29 +0200
-Subject: Hide "Send reports to Google"
+Subject: Hide send reports checkbox
 
 ---
  chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
@@ -9,7 +9,7 @@ Subject: Hide "Send reports to Google"
 diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
 --- a/chrome/android/java/res/layout/fre_tosanduma.xml
 +++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
                          android:layout_height="wrap_content"
                          android:lineSpacingMultiplier="1.4"
                          android:text="@string/fre_send_report_check"
@@ -19,5 +19,5 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
              </LinearLayout>
          </LinearLayout>
 -- 
-2.7.4
+2.11.0
 

build/patches/Modify-default-preferences.patch

@@ -5,7 +5,6 @@ Subject: Modify default preferences
 ---
  chrome/browser/background/background_mode_manager.cc              | 2 +-
  chrome/browser/chrome_content_browser_client.cc                   | 2 +-
- chrome/browser/io_thread.cc                                       | 2 +-
  chrome/browser/net/prediction_options.cc                          | 2 +-
  chrome/browser/net/prediction_options.h                           | 2 +-
  chrome/browser/profiles/profile.cc                                | 2 +-
@@ -15,16 +14,17 @@ Subject: Modify default preferences
  chrome/browser/ui/navigation_correction_tab_observer.cc           | 2 +-
  chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc     | 4 ----
  chrome/service/cloud_print/connector_settings.cc                  | 2 +-
- components/autofill/core/browser/autofill_manager.cc              | 2 +-
+ components/autofill/core/browser/autofill_manager.cc              | 5 +----
+ components/autofill/core/common/autofill_prefs.cc                 | 6 +++---
  components/bookmarks/browser/bookmark_utils.cc                    | 4 ++--
  components/safe_browsing/common/safe_browsing_prefs.cc            | 4 ++--
  extensions/common/extension.cc                                    | 8 --------
- 16 files changed, 18 insertions(+), 30 deletions(-)
+ 16 files changed, 20 insertions(+), 35 deletions(-)
 
 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -351,7 +351,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
    registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
  #endif
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -990,7 +990,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1053,7 +1053,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -45,18 +45,6 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
    registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
    // Register user prefs for mapping SitePerProcess and IsolateOrigins in
    // user policy in addition to the same named ones in Local State (which are
-diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
---- a/chrome/browser/io_thread.cc
-+++ b/chrome/browser/io_thread.cc
-@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
-                                std::string());
-   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
-   data_reduction_proxy::RegisterPrefs(registry);
--  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
-   registry->RegisterListPref(prefs::kDnsOverHttpsServers);
-   registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods);
-   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
@@ -84,7 +72,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -138,7 +138,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
+@@ -138,7 +138,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -100,15 +88,15 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
          </paper-button>
        </div>
        <div slot="footer">
--        <paper-checkbox id="sendSettings" checked>
-+        <paper-checkbox id="sendSettings">
-           $i18nRaw{resetPageFeedback}</paper-checkbox>
+-        <cr-checkbox id="sendSettings" checked>
++        <cr-checkbox id="sendSettings">
+           $i18nRaw{resetPageFeedback}</cr-checkbox>
        </div>
      </cr-dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -384,8 +384,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -353,8 +353,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
  void RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -122,7 +110,7 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -68,11 +68,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
@@ -133,13 +121,13 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
    registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
 -  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
-   registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
    registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
    registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
+   registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
+@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
  void NavigationCorrectionTabObserver::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* prefs) {
    prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
@@ -151,7 +139,7 @@ diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/br
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+@@ -127,10 +127,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kLocalDiscoveryNotificationsEnabled,
@@ -177,19 +165,47 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePrefs(
-   registry->RegisterIntegerPref(
-       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
+@@ -290,10 +290,7 @@ bool AutofillManager::ShouldShowCreditCardSigninPromo(
+ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
+                                        const base::TimeTicks timestamp) {
+   bool enabled = IsAutofillEnabled();
+-  if (!has_logged_autofill_enabled_) {
+-    AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled);
+-    has_logged_autofill_enabled_ = true;
+-  }
++  has_logged_autofill_enabled_ = true;
+ 
+   return enabled;
+ }
+diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
+--- a/components/autofill/core/common/autofill_prefs.cc
++++ b/components/autofill/core/common/autofill_prefs.cc
+@@ -91,10 +91,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kAutofillBillingCustomerNumber, 0.0,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
    registry->RegisterBooleanPref(
--      prefs::kAutofillEnabled, true,
-+      prefs::kAutofillEnabled, false,
+-      prefs::kAutofillEnabledDeprecated, true,
++      prefs::kAutofillEnabledDeprecated, false,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(
-       prefs::kAutofillProfileUseDatesFixed, false,
+-      prefs::kAutofillProfileEnabled, true,
++      prefs::kAutofillProfileEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterIntegerPref(
+       prefs::kAutofillLastVersionDeduped, 0,
+@@ -103,7 +103,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(
+-      prefs::kAutofillCreditCardEnabled, true,
++      prefs::kAutofillCreditCardEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterStringPref(
+       prefs::kAutofillProfileValidity, "",
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
+@@ -441,12 +441,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kShowBookmarkBar,
@@ -207,7 +223,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -229,9 +229,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(
@@ -222,7 +238,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -367,14 +367,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
    if (is_theme())
      return false;
  
@@ -238,5 +254,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
    // show packaged apps and platform apps because there are some pieces of
    // functionality that are only available in chrome://extensions/ but which
 -- 
-2.7.4
+2.11.0
 

build/patches/Never-fetch-popular-sites.patch

@@ -9,7 +9,7 @@ Subject: Never fetch popular sites
 diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
 --- a/components/ntp_tiles/popular_sites_impl.cc
 +++ b/components/ntp_tiles/popular_sites_impl.cc
-@@ -289,6 +289,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
+@@ -291,6 +291,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
    DCHECK(!callback_);
    callback_ = callback;
  
@@ -23,5 +23,5 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
        prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
    const base::TimeDelta time_since_last_download =
 -- 
-2.7.4
+2.11.0
 

build/patches/Never-send-any-crash-upload-data.patch

@@ -9,10 +9,10 @@ Subject: Never send any crash upload data
 diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -122,6 +122,9 @@ void TraceCrashServiceUploader::DoUpload(
+@@ -126,6 +126,9 @@ void TraceCrashServiceUploader::DoUpload(
      std::unique_ptr<const base::DictionaryValue> metadata,
      const UploadProgressCallback& progress_callback,
-     const UploadDoneCallback& done_callback) {
+     UploadDoneCallback done_callback) {
 +
 +  return;
 +
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/t
  
    progress_callback_ = progress_callback;
 -- 
-2.7.4
+2.11.0
 

build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 28 Oct 2018 14:11:50 +0100
+Subject: Offer builtin autocomplete for chrome://flags
+
+---
+ chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
++++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+@@ -242,6 +242,8 @@ std::vector<base::string16>
+ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+   std::vector<base::string16> builtins_to_provide;
+   builtins_to_provide.push_back(
++      base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
++  builtins_to_provide.push_back(
+       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
+ #if !defined(OS_ANDROID)
+   builtins_to_provide.push_back(
+-- 
+2.11.0
+

build/patches/Open-YouTube-links-in-Bromite.patch

@@ -9,7 +9,7 @@ Subject: Open YouTube links in Bromite
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-@@ -357,6 +357,13 @@ public class ExternalNavigationHandler {
+@@ -386,6 +386,13 @@ public class ExternalNavigationHandler {
              return OverrideUrlLoadingResult.NO_OVERRIDE;
          }
  
@@ -24,5 +24,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
          // security (only access to BROWSABLE activities).
          intent.addCategory(Intent.CATEGORY_BROWSABLE);
 -- 
-2.7.4
+2.11.0
 

build/patches/Punt-the-Widevine-version-string.patch

@@ -10,15 +10,15 @@ Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromi
 diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -526,7 +526,7 @@ void ChromeContentClient::AddContentDecryptionModules(
-     bool supports_persistent_license = false;
-     if (IsWidevineAvailable(&cdm_path, &video_codecs_supported,
-                             &supports_persistent_license)) {
+@@ -538,7 +538,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+     base::FilePath cdm_path;
+     content::CdmCapability capability;
+     if (IsWidevineAvailable(&cdm_path, &capability)) {
 -      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
 +      const base::Version version("1.0.123.456");
        DCHECK(version.IsValid());
  
-       cdms->push_back(content::CdmInfo(
+       cdms->push_back(
 -- 
-2.7.4
+2.11.0
 

build/patches/Reduce-permissions-needed-for-bookmarks-import-export.patch

@@ -0,0 +1,118 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 10 Nov 2018 16:09:26 +0100
+Subject: Reduce permissions needed for bookmarks import/export
+
+Completely remove contacts picker permission from the file dialog
+---
+ chrome/android/java/AndroidManifest.xml              |  1 -
+ chrome/browser/android/bookmarks/bookmark_bridge.cc  | 20 +++++++++++++++++---
+ .../src/org/chromium/ui/base/SelectFileDialog.java   | 12 ++++++++----
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
++++ b/chrome/android/java/AndroidManifest.xml
+@@ -35,7 +35,6 @@ by a child template that "extends" this file.
+     {% endif %}
+     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH"/>
+     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
+-    <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
+     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
+     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+ 
+diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
+--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
++++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
+@@ -552,14 +552,23 @@ void BookmarkBridge::ImportBookmarks(JNIEnv* env,
+   select_file_dialog_ = ui::SelectFileDialog::Create(
+     this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
+ 
+-  //NOTE: extension and description are not used on Android
++  //NOTE: extension and description are not used on Android, thus not set
+   ui::SelectFileDialog::FileTypeInfo file_type_info;
++
++#if defined(OS_ANDROID)
++  static const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };
++
++  // Android needs the original MIME types and an additional capture value.
++  std::pair<std::vector<base::string16>, bool> accept_types =
++      std::make_pair(v_accept_types, /* use_media_capture */ false);
++#else
+   file_type_info.extensions.resize(1);
+   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
+   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
+   file_type_info.extension_description_overrides.push_back(base::ASCIIToUTF16("Netscape Bookmark"));
+   file_type_info.allowed_paths =
+-      ui::SelectFileDialog::FileTypeInfo::NATIVE_OR_DRIVE_PATH;
++      ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
++#endif
+ 
+   select_file_dialog_->SelectFile(
+         ui::SelectFileDialog::SELECT_OPEN_FILE,
+@@ -569,7 +578,12 @@ void BookmarkBridge::ImportBookmarks(JNIEnv* env,
+         0,
+         base::FilePath::StringType(),
+         window,
+-        NULL);
++#if defined(OS_ANDROID)
++        &accept_types
++#else
++        NULL
++#endif
++);
+ 
+   //NOTE: this should be called after the actual import
+   Java_BookmarkBridge_bookmarksImported(env, obj);
+diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
++++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+@@ -52,6 +52,7 @@ public class SelectFileDialog
+     private static final String IMAGE_TYPE = "image/";
+     private static final String VIDEO_TYPE = "video/";
+     private static final String AUDIO_TYPE = "audio/";
++    private static final String HTML_TYPE = "text/html";
+     private static final String ALL_IMAGE_TYPES = IMAGE_TYPE + "*";
+     private static final String ALL_VIDEO_TYPES = VIDEO_TYPE + "*";
+     private static final String ALL_AUDIO_TYPES = AUDIO_TYPE + "*";
+@@ -159,7 +160,7 @@ public class SelectFileDialog
+             if (!window.hasPermission(Manifest.permission.READ_CONTACTS)) {
+                 missingPermissions.add(Manifest.permission.READ_CONTACTS);
+             }
+-        } else if (shouldUsePhotoPicker()) {
++        } else if (shouldUsePhotoPicker() || shouldShowHtmlTypes()) {
+             if (!window.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
+                 missingPermissions.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+             }
+@@ -324,9 +325,7 @@ public class SelectFileDialog
+      *   3.) There is a valid Android Activity associated with the file request.
+      */
+     private boolean shouldUseContactsPicker() {
+-        if (mFileTypes.size() != 1) return false;
+-        if (!mFileTypes.get(0).equals("text/json+contacts")) return false;
+-        return UiUtils.shouldShowContactsPicker() && mWindowAndroid.getActivity().get() != null;
++       return false;
+     }
+ 
+     /**
+@@ -347,6 +346,7 @@ public class SelectFileDialog
+             }
+             if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
+         }
++        if (mimeTypes.size() == 0) return null;
+         return mimeTypes;
+     }
+ 
+@@ -649,6 +649,10 @@ public class SelectFileDialog
+         return countAcceptTypesFor(specificType) > 0;
+     }
+ 
++    private boolean shouldShowHtmlTypes() {
++        return countAcceptTypesFor(HTML_TYPE) > 0;
++    }
++
+     private boolean shouldShowImageTypes() {
+         return shouldShowTypes(ALL_IMAGE_TYPES, IMAGE_TYPE);
+     }
+-- 
+2.11.0
+

build/patches/Remove-EV-certificates.patch

@@ -14,9 +14,9 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 --- a/net/cert/ev_root_ca_metadata.cc
 +++ b/net/cert/ev_root_ca_metadata.cc
 @@ -46,6 +46,16 @@ struct EVMetadata {
+   base::StringPiece policy_oids[kMaxOIDsPerCA];
+ };
  
- // These certificates may be found in net/data/ssl/ev_roots.
- static const EVMetadata ev_root_ca_metadata[] = {
 +  // need some dummy thing to make compiler happy, because
 +  // arraysize() is implemented as a convoluted template rather than
 +  // the traditional sizeof(x)/sizeof(*x)
@@ -27,10 +27,10 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 +    }
 +  },
 +#if 0
+ // These certificates may be found in net/data/ssl/ev_roots.
+ static const EVMetadata kEvRootCaMetadata[] = {
      // AC Camerfirma S.A. Chambers of Commerce Root - 2008
-     // https://www.camerfirma.com
-     {
-@@ -748,7 +758,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
+@@ -750,7 +760,9 @@ static const EVMetadata kEvRootCaMetadata[] = {
            0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
            0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
          {"2.16.840.1.114404.1.1.2.4.1", ""},
@@ -40,7 +40,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 +};
  
  #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
- 
+ }  // namespace
 -- 
-2.7.4
+2.11.0
 

build/patches/Remove-Sync-and-Translate-menu.patch

@@ -0,0 +1,226 @@
+From: Serg <serg.zhukovsky@gmail.com>
+Date: Wed, 22 Mar 2017 19:10:30 -0400
+Subject: Remove Sync and Translate menu
+
+---
+ .../java/res/drawable-hdpi/settings_translate.png  | Bin 399 -> 0 bytes
+ .../java/res/drawable-mdpi/settings_translate.png  | Bin 284 -> 0 bytes
+ .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes
+ .../res/drawable-xxhdpi/settings_translate.png     | Bin 793 -> 0 bytes
+ .../res/drawable-xxxhdpi/settings_translate.png    | Bin 1038 -> 0 bytes
+ .../java/res/xml/site_settings_preferences.xml     |   8 ++++----
+ .../website/SiteSettingsPreferences.java           |  22 ++-------------------
+ 7 files changed, 6 insertions(+), 24 deletions(-)
+ delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
+
+diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png
+deleted file mode 100644
+index 8067680e81c6ffa1a003c579411173827a3a9f96..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 399
+zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00042Nkl<ZcwWuc
+zJxjwt0LJme7er{c_yr2Oml}2V3s~G9aP6!}z(tU5et?4AT-<~%x+sFhO}e^tsU(Y=
+z0hgddd^pNsLc+Z{l>hP^9KR_C@$!FaVIla45F@WCMg$)o)DW3mQKSdON+{NY%D^rw
+zQ6|u}ti|NX7$R7iF@)z*9c+qa0?AUm<7d7%a4MD+^aKw>u^zc5))3o43mLu<Vh_0s
+z^onI1i*NbG31VmP*$I~u^o9@~3%Mjy{|2j}Ph4OPO<b`i*Ms^ERzc?^JnUm8&>5G;
+z8!SRo0o`C5w_HXQp+hq2?!?{u8c0%8C3Jue>()aulqxVESiz93aydblXyA)AxSXIZ
+z^u+3MIY49igeSZ=wug@XJ`tWQp%m)~(480Xl-fZ9?!ILEyg9Ig+E_v&p@gTlA*4tf
+tij`2N2SrL~qywpbE;5V|EcpMCd%u4DGPZTzo=E@z002ovPDHLkV1m$asKNjM
+
+diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png
+deleted file mode 100644
+index 3b9b4cd482d36a60d4ff0a110b0bcefabe4c1060..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 284
+zcmV+%0ptFOP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002vNkl<ZcwV*C
+zy$-=p90hPI21^H{kVr7~0h$;*gq(zkcms==tbG8pC$M2)sTe$f#Kz1feE^(W(wipt
+z>YqeTIHw=KscAEhFY_CKhZ7#j@Qh~#`t~HT1AWt&iOFYBic(;rl@5Y9UG&&#fH`9r
+zbqhPT0Nhc-8hg~aB!JnVj0zT9La;<0Ijq#SJr@m*036I22Uj!E;6TtuAD4*o-y97Z
+ziWuYbs-FagXn-mvsLH_>O?Hzl1RVtIfGq+yWZ%bGZULC0h?xp|DgiD=uf=xl!2Uvo
+icHkLEh=B&e`~;qlBW{m=6s{@&0000<MNUMnLSTX)y>C|l
+
+diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png
+deleted file mode 100644
+index 131a57394ca30dcff4bebcb2471bbbf0e1ac134e..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 547
+zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005%Nkl<ZcwX(-
+zziU%b9ER~X&>vK2=pT?4!CJ8B5V|`lSO?MdsRak2|3E2<Ew~ov3nC6K4yBGdHyIT=
+z*iKQTa&gEaRP2_R<9E1(_FiJ{F<-%<Je=X3K5*}FI12x`^1wNOsFIKphLn;}MY&1<
+zRa%6SwW!7e2_d2+9!QG-C&)S}0;KUkhyudj0~b#<hpahU{YD2gq>+I}uBO%C0%8~2
+zqX2{ZjJTXFC*U;?c-ddi5s!R<4~S{LXX_djTCRX~3-JV7yh7Y2cms!wTkrY83}bwB
+z2dpi`B^D8n3HSqaSVYzpI`{+pWDRAl*>VMX>`+5Y@YI?>wsz=YK)L(kPe6xV>d0E+
+zF#Fw0h$>%W?u)^|9b`@O%&0zU>qXpsF&Oy9RW@l8a&@DCv<Q46cvb|~;{k3U>t;Ei
+z!kb9ohzhbQ9F+l#U_I(XZ6fPFVyg@=tm03vA!hhtr^YXT;4QKq66}a~{=i*iH3)XZ
+zJ#V1R7-E(l!Okq>w0(hXWNl<?1F`K3EFkM3TL*{*PoRnN1<~{aRuPk2Kh<Oqt6sn{
+zQ;3x_<Vp}z9QyzXvi8mZd)X7f1*jwDbN5@1`5@{JK-uDfGz#d(14$IH9}C1i5_>Gi
+l0_C5%UG`c2pI-Xsz;EN&!BMZ3jZy#r002ovPDHLkV1l>+@2da+
+
+diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png
+deleted file mode 100644
+index 55878e697b1afed1b4f039a561dc6212e24fc024..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 793
+zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0008uNkl<ZcwX(=
+z%}Z2a6vy!qU&7QD6$CjgbzuaFrMYX-gy1F-TYN#>*(&T0P^f5;ixxw==!FDzQOmLj
+zW)TU|$~Iz9Aez>~5MeSGNzOdU;V@i=JI&0U$NLB~{9rb}%fp9z&%hk!M$92gIe;pl
+z3Wyj9l9(csBteWw5h(;j9dXi_fJqal&Mqj9DKT-2AY!CT2BnGF10^sPlCTEKJIX71
+z)JmT5wgxg*K&DJUmwnQupf11mfI$K*D&+>^c2@3W<t}H1aS^@Zph5Z5CZJigaScjR
+zMTBa$!Uuig{eHe=HE-q67$$tsm>kf|A8$jyfS$PkZE!?L6P{+3Y9btC#|6l6Q$SJA
+zJsJ|?2*wTQCyfHQr_G#j>iOXcWOyKi8a`n7&M5)i$G8LSaX}DgSmV5K&hghJ$naGk
+zn|yMVCHFr+W;};YV_bu_81R4w*m4VcMRV41&CGcb!S=Xdpk;b9jBZ}iok8`oEP#^s
+zxZ*(HxIwJ~nwTJkA;knuN_trO9#=T%BSV6b(8Ic?TcZbSdt70l>n4JR)6DpO>*nq3
+zafN}FIj#?Cl$~5NU<H)S4chdQct;y?eqjzexj|EYm%9W-*|Z3FLPYa42uQ+JQr19S
+z8PKI*ASGG4OG`vN`5X|W4{pi=YD6F%bO`8HV30TDOK#3CCj|0{M*=#@u3OM^=^OdI
+zpGG0Qa0|L3{jfB{0*bi=tx_fZf;0;Ps$$h0XjBJU8y)O1SD-zjI?&qaU`I*00lm%)
+zv^JT+e&Yso%`?y%9qc|Apbcs~1Fg})u4N;9(71N~84n-S`d?6M*r0iB`k2m2pEmR1
+zf(Er&%x+lJW-v@pl6q-6F+S;(uAXFgph;~W`+^>8I~g9RU77~AeL>qaNZ%d;C_u^s
+zlss&pgcZ=5Jy6WbGCgY#WaDr39a`*x^u>dcIQ=590n!A0HN&vZEG?C{V=ABuDD3<L
+X<=DewY$H`b00000NkvXXu0mjfrJ!K8
+
+diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
+deleted file mode 100644
+index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 1038
+zcmV+p1o8WcP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000BkNkl<ZcwX(>
+zK}Zx)90u@NR77ZDqzI8+I%LtIBq1>CB9(`rB#V~#N{sTXQQ#UFR4mj+L_yL)FVdw5
+zWziyt2t7o(5K@$fpoFMU*4D8)xU9Pq43Ec~9k(6b`LAza_%8CfJov%x+j;ZfQFNEb
+z12`KG-~l{<2LKCHgb{}Zy~t>YBMcRaBe4w#ApzaNBoHbkpa(iZdP)TdK_^P66aW<o
+zGC%?<Js=F7FkyN?+%{m2FFR)&5T^%dqyUW`ppydhRRcUgbKdOZfPML2wf+F5xOe~$
+za5X2_a&lcrfC1Ws*OwkpL^d<PXBoFq``hX^=<WnOVSo$r0_HGoWCB?$0G$l*T3*0U
+zRIr6&7Qk=#4L}fCncqTZ7+{YDaF5Y0%Y7~MjxY7x)Mrs=v_5>56u{HU0Q*gCKWkg%
+zzZ!iHpXGBfgAJ^klo-HsmH{^5htXtkfHkMxaUPh*CPp}jjBvX|#jNB2o*};A4dL$x
+zZaR^jWPl1(GQd%H9Vr*E#k6n`zua~vj+y|s+;yl=;Uat{fDf0DatmMzyH{Mi0aNk=
+z7SV+=VZjqPArQ*Yg+(*KsriBvfHVeB1BIss!$v=x(+(m{a9cQ39AFtk*a}5R2a=qY
+zM2G2rH)-YzYX!{XHtL`Vsl}LuIEGp%Af7L*1<;Mkoc-n;k}EEs#5wq==L@R`yh6DE
+zXe@BOIf?tU^9B0=>sf0D9wH09K(eHO_}X@%^EiwcGSJsOT46u}y38pI7<D_Kr9^-i
+zP=vg64xr$P1wcPDKIJ5!8q?%}`J8W;O8jyTpdd(2xC138cbx<%s3v|R?c{)Z)Ej_Z
+zjsbXDFiNzkzJbCM<!8IM&H##xEx>u<B=-&9*y*m*Er37RzyZxh(`*3z`0Eb9fWRFv
+zHG}Q|Gzy#Ng3&CnO?9su03QYHao!$h%_sQ*-2z~Qw<D~%AUhz1jU1q2iT6uT*&Xkc
+z+<->{wR6Q0;bXZ0hXla52{6vu7MTGve7a+uW@Zs&Q??m-0eu3rC-3h{ugD5mMnC|3
+zumC<VKmZvz0Z(nO@k~y@G24JP83D5>w+*PktbBkdCkD`$Cjm}~$_Loa0g=4O2nTGJ
+z4KN`LLB8h&d>4i%6LJCCIpB!UT62U0+GPT0sN#Uwe*rNLsDdUBpr7+<3XGr9!nmqm
+z9zX*J^g=I?UJhtjCjd!2fc<E02gFGMDSAMd6fjK>P)UbW5mEs8p!*B_)Bwsy8PjNj
+zLJc5zn3UxUnxN1F9DJOYCxvN5;D?e6@Sf=Q03N^tcmNOZ5BbKcjE%x^TL1t607*qo
+IM6N<$g2Gw1A^-pY
+
+diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
+--- a/chrome/android/java/res/xml/site_settings_preferences.xml
++++ b/chrome/android/java/res/xml/site_settings_preferences.xml
+@@ -50,9 +50,9 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="ads" />
+     <!-- Background sync -->
+-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
++    <!-- org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+-        android:key="background_sync" />
++        android:key="background_sync" /-->
+     <!-- Automatic Downloads -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+@@ -77,11 +77,11 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="sound" />
+     <!-- Google Translate -->
+-    <Preference
++    <!-- Preference
+         android:fragment="org.chromium.chrome.browser.preferences.website.TranslatePreferences"
+         android:key="translate"
+         android:title="@string/google_translate"
+-        android:icon="@drawable/settings_translate" />
++        android:icon="@drawable/settings_translate" /-->
+     <!-- Storage -->
+     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+@@ -39,7 +39,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     // are defined in the SiteSettingsCategory, additional keys
+     // are listed here.
+     static final String MEDIA_KEY = "media";
+-    static final String TRANSLATE_KEY = "translate";
+ 
+     // Whether the Protected Content menu is available for display.
+     boolean mProtectedContentMenuAvailable;
+@@ -83,11 +82,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             // The Media sub-menu only contains Protected Content and Autoplay, so remove all other
+             // menus.
+             for (@Type int i = 0; i < Type.NUM_ENTRIES; i++) {
+-                if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA) continue;
++                if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA || i == Type.BACKGROUND_SYNC) continue;
+                 getPreferenceScreen().removePreference(findPreference(i));
+             }
+             getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
+-            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+         } else {
+             // If both Autoplay and Protected Content menus are available, they'll be tucked under
+             // the Media key. Otherwise, we can remove the Media menu entry.
+@@ -109,11 +107,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
+                 getPreferenceScreen().removePreference(findPreference(Type.CLIPBOARD));
+             }
+-            // The new Languages Preference *feature* is an advanced version of this translate
+-            // preference. Once Languages Preference is enabled, remove this setting.
+-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
+-                getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+-            }
+             if (!ChromeFeatureList.isEnabled(ChromeFeatureList.GENERIC_SENSOR_EXTRA_CLASSES)) {
+                 getPreferenceScreen().removePreference(findPreference(Type.SENSORS));
+             }
+@@ -123,10 +116,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     private void updatePreferenceStates() {
+         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
+ 
+-        // Translate preference.
+-        Preference translatePref = findPreference(TRANSLATE_KEY);
+-        if (translatePref != null) setTranslateStateSummary(translatePref);
+-
+         // Preferences that navigate to Website Settings.
+         List<Integer> websitePrefs = new ArrayList<Integer>();
+         if (mMediaSubMenu) {
+@@ -143,7 +132,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             if (!mProtectedContentMenuAvailable) {
+                 websitePrefs.add(Type.AUTOPLAY);
+             }
+-            websitePrefs.add(Type.BACKGROUND_SYNC);
++//            websitePrefs.add(Type.BACKGROUND_SYNC);
+             websitePrefs.add(Type.CAMERA);
+             if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
+                 websitePrefs.add(Type.CLIPBOARD);
+@@ -246,11 +235,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
+                 preference.getTitle().toString());
+         return false;
+     }
+-
+-    private void setTranslateStateSummary(Preference translatePref) {
+-        boolean translateEnabled = PrefServiceBridge.getInstance().isTranslateEnabled();
+-        translatePref.setSummary(translateEnabled
+-                ? R.string.website_settings_category_ask
+-                : R.string.website_settings_category_blocked);
+-    }
+ }
+-- 
+2.11.0
+

build/patches/Remove-help-menu-item.patch

@@ -12,7 +12,7 @@ Subject: Remove help menu item
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -98,8 +98,6 @@
+@@ -76,8 +76,6 @@
              android:icon="@drawable/reader_mode_prefs_icon" />
          <item android:id="@+id/preferences_id"
              android:title="@string/menu_preferences" />
@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -1975,15 +1975,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2124,15 +2124,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  
@@ -43,7 +43,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -338,9 +338,6 @@ public class KeyboardShortcuts {
+@@ -341,9 +341,6 @@ public class KeyboardShortcuts {
                      tab = activity.getActivityTab();
                      if (tab != null && tab.canGoForward()) tab.goForward();
                      return true;
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -1016,7 +1016,7 @@ public class CustomTabActivity extends ChromeActivity {
+@@ -1314,7 +1314,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
      public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
          // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
          if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
@@ -66,5 +66,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
                  || id == R.id.open_history_menu_id) {
              return true;
 -- 
-2.7.4
+2.11.0
 

build/patches/Remove-request-for-account-access-permission-on-reboot.patch

@@ -1,16 +1,16 @@
 From: SergeyZhukovsky <serg.zhukovsky@gmail.com>
 Date: Tue, 15 Aug 2017 15:33:16 -0400
-Subject: Remove google account access permission on reboot
+Subject: Remove request for account access permission on reboot
 
 ---
- chrome/android/BUILD.gn                 | 3 +--
+ chrome/android/BUILD.gn                 | 4 +---
  chrome/android/java/AndroidManifest.xml | 4 ++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
+ 2 files changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -784,8 +784,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -943,8 +943,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
    resources = [
      "java/res_template/xml/file_paths.xml",
      "java/res_template/xml/launchershortcuts.xml",
@@ -20,10 +20,18 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
    ]
    res_dir = "java/res_template"
    variables = chrome_public_jinja_variables
+@@ -955,7 +954,6 @@ jinja_template_resources("chrome_sync_shell_apk_template_resources") {
+     "java/res_template/xml/file_paths.xml",
+     "java/res_template/xml/launchershortcuts.xml",
+     "java/res_template/xml/searchable.xml",
+-    "java/res_template/xml/syncadapter.xml",
+   ]
+   res_dir = "java/res_template"
+   variables = chrome_sync_shell_jinja_variables
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -804,14 +804,14 @@ by a child template that "extends" this file.
+@@ -829,14 +829,14 @@ by a child template that "extends" this file.
          </provider>
  
          <!-- Sync adapter for browser invalidation. -->
@@ -41,5 +49,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- Broadcast receiver that will be notified of account changes -->
          <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
 -- 
-2.7.4
+2.11.0
 

build/patches/Restore-classic-new-tab-page.patch

@@ -22,5 +22,5 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
  
  bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
 -- 
-2.7.4
+2.11.0
 

build/patches/Revert-Download-location-android-Check-SD-card-before-showing-location-dialog.patch

@@ -0,0 +1,109 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 20 Dec 2018 18:23:32 +0100
+Subject: Revert "Download location android: Check SD card before showing
+ location dialog."
+
+This reverts commit 9ade596cc0b315f1f9c3292e1fd8d6182e32fde2.
+---
+ .../download/DownloadLocationDialogBridge.java     | 50 +++-------------------
+ 1 file changed, 6 insertions(+), 44 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
+@@ -4,9 +4,6 @@
+ 
+ package org.chromium.chrome.browser.download;
+ 
+-import android.content.Context;
+-import android.text.TextUtils;
+-
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.browser.ChromeActivity;
+@@ -17,7 +14,6 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+ import org.chromium.ui.base.WindowAndroid;
+ 
+ import java.io.File;
+-import java.util.ArrayList;
+ 
+ /**
+  * Helper class to handle communication between download location dialog and native.
+@@ -26,10 +22,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+     private long mNativeDownloadLocationDialogBridge;
+     private DownloadLocationDialog mLocationDialog;
+     private ModalDialogManager mModalDialogManager;
+-    private long mTotalBytes;
+-    private @DownloadLocationDialogType int mDialogType;
+-    private String mSuggestedPath;
+-    private Context mContext;
+ 
+     private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) {
+         mNativeDownloadLocationDialogBridge = nativeDownloadLocationDialogBridge;
+@@ -60,13 +52,12 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+         }
+ 
+         mModalDialogManager = activity.getModalDialogManager();
+-        mContext = activity;
+-        mTotalBytes = totalBytes;
+-        mDialogType = dialogType;
+-        mSuggestedPath = suggestedPath;
+ 
+-        DownloadDirectoryProvider.getInstance().getAllDirectoriesOptions(
+-                (ArrayList<DirectoryOption> dirs) -> { onDirectoryOptionsRetrieved(dirs); });
++        if (mLocationDialog != null) return;
++        mLocationDialog = DownloadLocationDialog.create(
++                this, activity, totalBytes, dialogType, new File(suggestedPath));
++
++        mModalDialogManager.showDialog(mLocationDialog, ModalDialogManager.ModalDialogType.APP);
+     }
+ 
+     @Override
+@@ -101,34 +92,6 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+     }
+ 
+     /**
+-     * Called after retrieved the download directory options.
+-     * @param dirs An list of available download directories.
+-     */
+-    private void onDirectoryOptionsRetrieved(ArrayList<DirectoryOption> dirs) {
+-        // If there is only one directory available, don't show the default dialog, and set the
+-        // download directory to default. Dialog will still show for other types of dialogs, like
+-        // name conflict or disk error.
+-        if (dirs.size() == 1 && mDialogType == DownloadLocationDialogType.DEFAULT) {
+-            final DirectoryOption dir = dirs.get(0);
+-            if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) {
+-                assert(!TextUtils.isEmpty(dir.location));
+-                PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory(
+-                        dir.location);
+-                nativeOnComplete(mNativeDownloadLocationDialogBridge, mSuggestedPath);
+-            }
+-            return;
+-        }
+-
+-        // Already showing the dialog.
+-        if (mLocationDialog != null) return;
+-
+-        // Actually show the dialog.
+-        mLocationDialog = DownloadLocationDialog.create(
+-                this, mContext, mTotalBytes, mDialogType, new File(mSuggestedPath));
+-        mModalDialogManager.showDialog(mLocationDialog, ModalDialogManager.ModalDialogType.APP);
+-    }
+-
+-    /**
+      * Pass along information from location dialog to native.
+      *
+      * @param fileName      Name the user gave the file.
+@@ -156,8 +119,7 @@ public class DownloadLocationDialogBridge implements ModalDialogView.Controller
+             nativeOnComplete(mNativeDownloadLocationDialogBridge, file.getAbsolutePath());
+         }
+ 
+-        // Update preference to show prompt based on whether checkbox is checked only when the user
+-        // click the positive button.
++        // Update preference to show prompt based on whether checkbox is checked.
+         if (dontShowAgain) {
+             PrefServiceBridge.getInstance().setPromptForDownloadAndroid(
+                     DownloadPromptStatus.DONT_SHOW);
+-- 
+2.11.0
+

build/patches/Skip-the-first-run-and-metrics.patch

@@ -3,10 +3,10 @@ Date: Sun, 26 Nov 2017 22:51:43 +0100
 Subject: Skip the first run and metrics
 
 ---
- .../chrome/browser/firstrun/FirstRunStatus.java        |  8 ++++----
- .../chrome/browser/firstrun/FirstRunUtils.java         | 16 ++++++----------
- .../browser/firstrun/ToSAndUMAFirstRunFragment.java    | 18 ++++++------------
- 3 files changed, 16 insertions(+), 26 deletions(-)
+ .../chromium/chrome/browser/firstrun/FirstRunStatus.java |  8 ++++----
+ .../chromium/chrome/browser/firstrun/FirstRunUtils.java  | 16 ++++++----------
+ .../browser/firstrun/ToSAndUMAFirstRunFragment.java      |  6 ++++--
+ 3 files changed, 14 insertions(+), 16 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
@@ -56,33 +56,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+@@ -74,7 +74,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
              }
          });
  
 -        if (ChromeVersionInfo.isOfficialBuild()) {
--            int paddingStart = getResources().getDimensionPixelSize(
--                    R.dimen.fre_tos_checkbox_padding);
--            ApiCompatibilityUtils.setPaddingRelative(mSendReportCheckBox,
--                    ApiCompatibilityUtils.getPaddingStart(mSendReportCheckBox) + paddingStart,
--                    mSendReportCheckBox.getPaddingTop(),
--                    ApiCompatibilityUtils.getPaddingEnd(mSendReportCheckBox),
--                    mSendReportCheckBox.getPaddingBottom());
--
--            mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
--        } else {
--            mSendReportCheckBox.setVisibility(View.GONE);
-+        int paddingStart = getResources().getDimensionPixelSize(R.dimen.fre_tos_checkbox_padding);
-+        if (paddingStart != 0) {
-+            mSendReportCheckBox.setChecked(false);
-         }
++/*        if (ChromeVersionInfo.isOfficialBuild()) {
+             int paddingStart = getResources().getDimensionPixelSize(
+                     R.dimen.fre_tos_checkbox_padding);
+             ViewCompat.setPaddingRelative(mSendReportCheckBox,
+@@ -86,8 +86,10 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+             mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
+         } else {
+             mSendReportCheckBox.setVisibility(View.GONE);
+-        }
++        }*/
  
 +        mSendReportCheckBox.setChecked(false);
 +        mSendReportCheckBox.setVisibility(View.GONE);
-+
          mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
  
-         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan() {
+         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan((view1) -> {
 -- 
-2.7.4
+2.11.0
 

build/patches/User-Agent-anonymize.patch

@@ -0,0 +1,157 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 21 Mar 2018 14:15:28 +0100
+Subject: User Agent: anonymize
+
+Use a fixed device name and Chrome product version with the goal of not
+disclosing the specific build of Bromite.
+---
+ components/version_info/version_info.cc | 13 +++++-
+ content/common/user_agent.cc            | 72 ++++++++++++++++++++-------------
+ 2 files changed, 57 insertions(+), 28 deletions(-)
+
+diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
+--- a/components/version_info/version_info.cc
++++ b/components/version_info/version_info.cc
+@@ -7,13 +7,24 @@
+ #include "base/logging.h"
+ #include "base/no_destructor.h"
+ #include "base/version.h"
++#include "base/sys_info.h"
+ #include "build/build_config.h"
+ #include "components/version_info/version_info_values.h"
+ 
+ namespace version_info {
+ 
+ std::string GetProductNameAndVersionForUserAgent() {
+-  return "Chrome/" + GetVersionNumber();
++  int32_t major, minor, bugfix;
++  base::SysInfo::OperatingSystemVersionNumbers(&major,
++                                               &minor,
++                                               &bugfix);
++  switch (major) {
++    case 4:
++      return "Chrome/69.0.3497.100";
++  }
++
++  // version 5 and above
++  return "Chrome/70.0.3538.80";
+ }
+ 
+ std::string GetProductName() {
+diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
+--- a/content/common/user_agent.cc
++++ b/content/common/user_agent.cc
+@@ -22,11 +22,6 @@
+ 
+ namespace content {
+ 
+-#if defined(OS_ANDROID)
+-const base::Feature kAndroidUserAgentStringContainsBuildId{
+-    "AndroidUserAgentStringContainsBuildId", base::FEATURE_DISABLED_BY_DEFAULT};
+-#endif  // defined(OS_ANDROID)
+-
+ std::string GetWebKitVersion() {
+   return base::StringPrintf("%d.%d (%s)",
+                             WEBKIT_VERSION_MAJOR,
+@@ -66,7 +61,32 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+   }
+ #elif defined(OS_ANDROID)
+   std::string android_version_str = base::SysInfo::OperatingSystemVersion();
+-  std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
++  std::string android_info_str;
++
++  // Send information about the device and build ID.
++  // Use a common device/build ID based on Android major version.
++  switch (os_major_version) {
++    default: // version 9 and above
++      android_info_str = "ONEPLUS A6000";
++      break;
++    case 8:
++      android_info_str = "FIG-LX3";
++      break;
++    case 7:
++      android_info_str = "SM-G610M";
++      break;
++    case 6:
++      android_info_str = "SM-J700M";
++      break;
++    case 5:
++      android_info_str = "XT1033";
++      break;
++    case 4:
++      android_info_str = "ZTE Blade C370 Build/KOT49H";
++      break;
++  }
++
++  android_info_str = " " + android_info_str;
+ #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
+   // Should work on any Posix system.
+   struct utsname unixinfo;
+@@ -102,7 +122,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+       os_minor_version,
+       os_bugfix_version
+ #elif defined(OS_ANDROID)
+-      "Android %s%s",
++      "Android %s;%s",
+       android_version_str.c_str(),
+       android_info_str.c_str()
+ #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+@@ -137,18 +157,6 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
+   return BuildUserAgentFromOSAndProduct(os_info, product);
+ }
+ 
+-#if defined(OS_ANDROID)
+-std::string BuildUserAgentFromProductAndExtraOSInfo(
+-    const std::string& product,
+-    const std::string& extra_os_info,
+-    bool include_android_build_number) {
+-  std::string os_info;
+-  base::StringAppendF(&os_info, "%s%s%s", getUserAgentPlatform().c_str(),
+-                      BuildOSCpuInfo(include_android_build_number).c_str(),
+-                      extra_os_info.c_str());
+-  return BuildUserAgentFromOSAndProduct(os_info, product);
+-}
+-
+ std::string GetAndroidOSInfo(bool include_android_build_number) {
+   std::string android_info_str;
+ 
+@@ -162,18 +170,28 @@ std::string GetAndroidOSInfo(bool include_android_build_number) {
+   }
+ 
+   // Append the build ID.
+-  if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) ||
+-      include_android_build_number) {
+-    std::string android_build_id = base::SysInfo::GetAndroidBuildID();
+-    if (!android_build_id.empty()) {
+-      if (!semicolon_inserted)
+-        android_info_str += ";";
+-      android_info_str += " Build/" + android_build_id;
+-    }
++  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
++  if (!android_build_id.empty()) {
++    if (!semicolon_inserted)
++      android_info_str += ";";
++    android_info_str += " Build/" + android_build_id;
+   }
+ 
+   return android_info_str;
+ }
++
++#if defined(OS_ANDROID)
++std::string BuildUserAgentFromProductAndExtraOSInfo(
++    const std::string& product,
++    const std::string& extra_os_info,
++    bool include_android_build_number) {
++  std::string os_info;
++  base::StringAppendF(&os_info, "%s%s%s", getUserAgentPlatform().c_str(),
++                      BuildOSCpuInfo(include_android_build_number).c_str(),
++                      extra_os_info.c_str());
++  return BuildUserAgentFromOSAndProduct(os_info, product);
++}
++
+ #endif  // defined(OS_ANDROID)
+ 
+ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
+-- 
+2.11.0
+

build/patches/autofill-disable-autofill-download-manager.patch

@@ -4,40 +4,44 @@ Subject: autofill: disable autofill download manager
 
 Disables the autofill download manager (trk:158).
 ---
- components/autofill/core/browser/autofill_download_manager.cc | 9 +--------
+ components/autofill/core/browser/autofill_download_manager.cc | 6 +++++-
  components/autofill/core/browser/autofill_manager.cc          | 2 ++
- 2 files changed, 3 insertions(+), 8 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
 --- a/components/autofill/core/browser/autofill_download_manager.cc
 +++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -133,12 +133,6 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = {
-     false,
- };
+@@ -49,7 +49,6 @@ namespace autofill {
  
--#if defined(GOOGLE_CHROME_BUILD)
--const char kClientName[] = "Google Chrome";
--#else
--const char kClientName[] = "Chromium";
--#endif  // defined(GOOGLE_CHROME_BUILD)
--
- size_t CountActiveFieldsInForms(const std::vector<FormStructure*>& forms) {
-   size_t active_field_count = 0;
-   for (const auto* form : forms)
-@@ -158,8 +152,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
+ namespace {
+ 
+-const size_t kMaxQueryGetSize = 1400;  // 1.25KB
+ const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
+ const size_t kMaxFieldsPerQueryRequest = 100;
+ 
+@@ -491,6 +490,7 @@ void AutofillDownloadManager::ClearUploadHistory(PrefService* pref_service) {
+ 
+ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+     const FormRequestData& request_data) const {
++#if 0
+   std::string method("POST");
+   std::string query_str;
+ 
+@@ -513,6 +513,10 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+   GURL url = autofill_server_url_
+                  .Resolve(RequestTypeToString(request_data.request_type))
+                  .ReplaceComponents(replacements);
++#else
++  std::string method("GET");
++  GURL url = GURL("about:blank");
++#endif
+   return std::make_tuple(std::move(url), std::move(method));
  }
  
- GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
--  return GURL("https://clients1.google.com/tbproxy/af/" +
--              RequestTypeToString(request_type) + "?client=" + kClientName);
-+  return GURL("about:blank/");
- }
- 
- std::ostream& operator<<(std::ostream& out,
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -1255,9 +1255,11 @@ AutofillManager::AutofillManager(
+@@ -1166,9 +1166,11 @@ AutofillManager::AutofillManager(
        weak_ptr_factory_(this) {
    DCHECK(driver);
    DCHECK(client_);
@@ -50,5 +54,5 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
    if (personal_data_ && client_)
      personal_data_->OnSyncServiceInitialized(client_->GetSyncService());
 -- 
-2.7.4
+2.11.0
 

build/patches/battery_status_service-disable-more-privacy-nightmares.patch

@@ -41,5 +41,5 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
    return callback_list_.Add(callback);
  }
 -- 
-2.7.4
+2.11.0
 

build/patches/browser-ui-disable-warning-about-missing-API-keys.patch

@@ -19,5 +19,5 @@ diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chr
        std::unique_ptr<ConfirmInfoBarDelegate>(
            new GoogleApiKeysInfoBarDelegate())));
 -- 
-2.7.4
+2.11.0
 

build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch

@@ -1,6 +1,6 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: Mon, 15 Sep 2014 10:58:42 +0200
-Subject: dns: send IPv6 connectivity probes to RIPE DNS rather than Google
+Subject: dns: send IPv6 connectivity probes to RIPE DNS
 
 Short of disabling the code (we may do that in a subsequent patch
 anyway), avoid sending to Google.
@@ -11,7 +11,7 @@ anyway), avoid sending to Google.
 diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
 --- a/net/dns/host_resolver_impl.cc
 +++ b/net/dns/host_resolver_impl.cc
-@@ -109,10 +109,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
+@@ -115,10 +115,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
  // cached.
  const int kIPv6ProbePeriodMs = 1000;
  
@@ -26,5 +26,5 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
  // We use a separate histogram name for each platform to facilitate the
  // display of error codes by their symbolic name (since each platform has
 -- 
-2.7.4
+2.11.0
 

build/patches/extensions-always-show-component-extensions-in-the-ext-list.patch

@@ -18,7 +18,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/28
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -380,9 +380,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -379,9 +379,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
  }
  
  bool Extension::ShouldExposeViaManagementAPI() const {
@@ -32,5 +32,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
  
  Extension::ManifestData* Extension::GetManifestData(const std::string& key)
 -- 
-2.7.4
+2.11.0
 

build/patches/first_run-deactivate-autoupdate-globally.patch

@@ -15,7 +15,7 @@ turn it back on.
 diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
 --- a/chrome/browser/extensions/extension_system_impl.cc
 +++ b/chrome/browser/extensions/extension_system_impl.cc
-@@ -206,8 +206,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
+@@ -203,8 +203,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
    // ExtensionService depends on RuntimeData.
    runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
  
@@ -26,5 +26,5 @@ diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser
    if (!extensions_enabled ||
        chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) {
 -- 
-2.7.4
+2.11.0
 

build/patches/getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch

@@ -0,0 +1,219 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 30 Mar 2018 10:09:03 +0200
+Subject: getClientRects, getBoundingClientRect, measureText: add
+ fingerprinting mitigation
+
+Scale the result of Range::getClientRects, Element::getBoundingClientRect and
+Canvas::measureText by a random +/-3/1000000th of the original value for each
+float in the returned Rect/Quad.
+
+Rationale is that the returned values are within the same order of magnitude
+of the floating point precision being used for fingerprinting and sufficient
+to poison the well.
+
+See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
+---
+ third_party/blink/renderer/core/dom/document.cc        | 13 +++++++++++++
+ third_party/blink/renderer/core/dom/document.h         |  5 +++++
+ third_party/blink/renderer/core/dom/element.cc         | 16 ++++++++++++++++
+ third_party/blink/renderer/core/dom/range.cc           | 18 +++++++++++++++++-
+ .../blink/renderer/core/html/canvas/text_metrics.cc    | 18 ++++++++++++++++++
+ .../blink/renderer/core/html/canvas/text_metrics.h     |  2 ++
+ .../canvas/canvas2d/canvas_rendering_context_2d.cc     | 10 +++++++++-
+ 7 files changed, 80 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
++++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -33,6 +33,7 @@
+ 
+ #include "base/auto_reset.h"
+ #include "base/optional.h"
++#include "base/rand_util.h"
+ #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
+ #include "services/metrics/public/cpp/ukm_builders.h"
+ #include "services/metrics/public/cpp/ukm_source_id.h"
+@@ -725,6 +726,10 @@ Document::Document(const DocumentInit& initializer,
+   }
+   DCHECK(fetcher_);
+ 
++  // add X/Y noise factors that will be used to mitigate fingerprinting
++  shuffleFactorX_ = base::RandDouble();
++  shuffleFactorY_ = base::RandDouble();
++
+   root_scroller_controller_ = RootScrollerController::Create(*this);
+ 
+   // We depend on the url getting immediately set in subframes, but we
+@@ -790,6 +795,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
+                        Position::BeforeNode(*shadow_host));
+ }
+ 
++double Document::GetShuffleFactorX() {
++	return shuffleFactorX_;
++}
++
++double Document::GetShuffleFactorY() {
++	return shuffleFactorY_;
++}
++
+ SelectorQueryCache& Document::GetSelectorQueryCache() {
+   if (!selector_query_cache_)
+     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
+diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
+--- a/third_party/blink/renderer/core/dom/document.h
++++ b/third_party/blink/renderer/core/dom/document.h
+@@ -427,6 +427,9 @@ class CORE_EXPORT Document : public ContainerNode,
+     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
+   }
+ 
++  double GetShuffleFactorX();
++  double GetShuffleFactorY();
++
+   String visibilityState() const;
+   mojom::PageVisibilityState GetPageVisibilityState() const;
+   bool hidden() const;
+@@ -1780,6 +1783,8 @@ class CORE_EXPORT Document : public ContainerNode,
+ 
+   double start_time_;
+ 
++  double shuffleFactorX_, shuffleFactorY_;
++
+   TraceWrapperMember<ScriptRunner> script_runner_;
+ 
+   HeapVector<Member<ScriptElementBase>> current_script_stack_;
+diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
+--- a/third_party/blink/renderer/core/dom/element.cc
++++ b/third_party/blink/renderer/core/dom/element.cc
+@@ -1363,6 +1363,15 @@ DOMRectList* Element::getClientRects() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
+       quads, *element_layout_object);
++
++  // scale all quads
++  auto shuffleX = 1 + (GetDocument().GetShuffleFactorX() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (GetDocument().GetShuffleFactorY() - 0.5) * 0.000003;
++
++  for (FloatQuad& quad : quads) {
++    quad.Scale(shuffleX, shuffleY);
++  }
++
+   return DOMRectList::Create(quads);
+ }
+ 
+@@ -1380,6 +1389,13 @@ DOMRect* Element::getBoundingClientRect() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
+                                                         *element_layout_object);
++
++  // scale rect by 3/1000000th
++  auto shuffleX = 1 + (GetDocument().GetShuffleFactorX() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (GetDocument().GetShuffleFactorY() - 0.5) * 0.000003;
++
++  result.Scale(shuffleX, shuffleY);
++
+   return DOMRect::FromFloatRect(result);
+ }
+ 
+diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
+--- a/third_party/blink/renderer/core/dom/range.cc
++++ b/third_party/blink/renderer/core/dom/range.cc
+@@ -1606,11 +1606,27 @@ DOMRectList* Range::getClientRects() const {
+   Vector<FloatQuad> quads;
+   GetBorderAndTextQuads(quads);
+ 
++  // scale all quads by 3/1000000th
++  auto shuffleX = 1 + (owner_document_->GetShuffleFactorX() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (owner_document_->GetShuffleFactorY() - 0.5) * 0.000003;
++
++  for (FloatQuad& quad : quads) {
++    quad.Scale(shuffleX, shuffleY);
++  }
++
+   return DOMRectList::Create(quads);
+ }
+ 
+ DOMRect* Range::getBoundingClientRect() const {
+-  return DOMRect::FromFloatRect(BoundingRect());
++  auto rect = BoundingRect();
++
++  // scale rect by 3/1000000th
++  auto shuffleX = 1 + (owner_document_->GetShuffleFactorX() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (owner_document_->GetShuffleFactorY() - 0.5) * 0.000003;
++
++  rect.Scale(shuffleX, shuffleY);
++
++  return DOMRect::FromFloatRect(rect);
+ }
+ 
+ // TODO(editing-dev): We should make
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
++++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+@@ -38,6 +38,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
+   return 0;
+ }
+ 
++void TextMetrics::Shuffle(const double factor) {
++  // x-direction
++  width_ *= factor;
++  actual_bounding_box_left_ *= factor;
++  actual_bounding_box_right_ *= factor;
++
++  // y-direction
++  font_bounding_box_ascent_ *= factor;
++  font_bounding_box_descent_ *= factor;
++  actual_bounding_box_ascent_ *= factor;
++  actual_bounding_box_descent_ *= factor;
++  em_height_ascent_ *= factor;
++  em_height_descent_ *= factor;
++  baselines_.setAlphabetic(baselines_.alphabetic() * factor);
++  baselines_.setHanging(baselines_.hanging() * factor);
++  baselines_.setIdeographic(baselines_.ideographic() * factor);
++}
++
+ void TextMetrics::Update(const Font& font,
+                          const TextDirection& direction,
+                          const TextBaseline& baseline,
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
++++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+@@ -68,6 +68,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+ 
+   static float GetFontBaseline(const TextBaseline&, const SimpleFontData&);
+ 
++  void Shuffle(const double factor);
++
+  private:
+   void Update(const Font&,
+               const TextDirection&,
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
++++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -33,6 +33,8 @@
+ 
+ #include "third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h"
+ 
++#include "base/rand_util.h"
++
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/public/platform/task_type.h"
+ #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
+@@ -782,8 +784,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+   else
+     direction = ToTextDirection(GetState().GetDirection(), canvas());
+ 
+-  return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
++  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+                              GetState().GetTextAlign(), text);
++
++  // scale text metrics by 3/1000000th
++  auto shuffleFactor = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  textMetrics->Shuffle(shuffleFactor);
++
++  return textMetrics;
+ }
+ 
+ void CanvasRenderingContext2D::DrawTextInternal(
+-- 
+2.11.0
+

build/patches/google-cloud-messaging-disable-experiment-status-check.patch

@@ -10,7 +10,7 @@ This avoids trk:263 from triggering.
 diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
 --- a/components/gcm_driver/gcm_channel_status_request.cc
 +++ b/components/gcm_driver/gcm_channel_status_request.cc
-@@ -23,8 +23,10 @@ namespace gcm {
+@@ -24,8 +24,10 @@ namespace gcm {
  
  namespace {
  
@@ -21,24 +21,24 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc
  const int kDefaultPollIntervalSeconds = 60 * 60;  // 60 minutes.
  const int kMinPollIntervalSeconds = 30 * 60;  // 30 minutes.
  
-@@ -57,6 +59,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
- }
+@@ -58,6 +60,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
  
  void GCMChannelStatusRequest::Start() {
+   // url_loader_factory_ can be null for tests.
 +#if 0
-   DCHECK(!url_fetcher_.get());
+   if (!url_loader_factory_)
+     return;
  
-   GURL request_url(channel_status_request_url_);
-@@ -112,6 +115,9 @@ void GCMChannelStatusRequest::Start() {
-   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
-                              net::LOAD_DO_NOT_SAVE_COOKIES);
-   url_fetcher_->Start();
+@@ -113,6 +116,9 @@ void GCMChannelStatusRequest::Start() {
+       net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
+   resource_request->method = "POST";
+   resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent,
 +#endif
 +  // Simulate an empty response and disable GCM.
 +  callback_.Run(false, false, 0);
- }
- 
- void GCMChannelStatusRequest::OnURLFetchComplete(
+                                       user_agent_);
+   // TODO(https://crbug.com/808498): Re-add data use measurement once
+   // SimpleURLLoader supports it.
 -- 
-2.7.4
+2.11.0
 

build/patches/kill-Auth.patch

@@ -0,0 +1,161 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:06:15 +0200
+Subject: kill Auth
+
+---
+ .../chrome/browser/signin/SigninHelper.java        | 22 +---------
+ .../components/signin/AccountIdProvider.java       |  9 +---
+ .../signin/SystemAccountManagerDelegate.java       | 50 ++--------------------
+ 3 files changed, 5 insertions(+), 76 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+@@ -8,10 +8,6 @@ import android.accounts.Account;
+ import android.annotation.SuppressLint;
+ import android.content.Context;
+ 
+-import com.google.android.gms.auth.AccountChangeEvent;
+-import com.google.android.gms.auth.GoogleAuthException;
+-import com.google.android.gms.auth.GoogleAuthUtil;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.VisibleForTesting;
+@@ -71,23 +67,7 @@ public class SigninHelper {
+         @Override
+         public List<String> getAccountChangeEvents(
+                 Context context, int index, String accountName) {
+-            try {
+-                List<AccountChangeEvent> list = GoogleAuthUtil.getAccountChangeEvents(
+-                        context, index, accountName);
+-                List<String> result = new ArrayList<>(list.size());
+-                for (AccountChangeEvent e : list) {
+-                    if (e.getChangeType() == GoogleAuthUtil.CHANGE_TYPE_ACCOUNT_RENAMED_TO) {
+-                        result.add(e.getChangeData());
+-                    } else {
+-                        result.add(null);
+-                    }
+-                }
+-                return result;
+-            } catch (IOException e) {
+-                Log.w(TAG, "Failed to get change events", e);
+-            } catch (GoogleAuthException e) {
+-                Log.w(TAG, "Failed to get change events", e);
+-            }
++
+             return new ArrayList<>(0);
+         }
+     }
+diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java
+--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java
++++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java
+@@ -4,8 +4,6 @@
+ 
+ package org.chromium.components.signin;
+ 
+-import com.google.android.gms.auth.GoogleAuthException;
+-import com.google.android.gms.auth.GoogleAuthUtil;
+ import com.google.android.gms.common.ConnectionResult;
+ import com.google.android.gms.common.GoogleApiAvailability;
+ 
+@@ -40,12 +38,7 @@ public class AccountIdProvider {
+      * @param accountName The email address of a Google account.
+      */
+     public String getAccountId(String accountName) {
+-        try {
+-            return GoogleAuthUtil.getAccountId(ContextUtils.getApplicationContext(), accountName);
+-        } catch (IOException | GoogleAuthException ex) {
+-            Log.e("cr.AccountIdProvider", "AccountIdProvider.getAccountId", ex);
+-            return null;
+-        }
++        return null;
+     }
+ 
+     /**
+diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
++++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+@@ -24,9 +24,6 @@ import android.os.PatternMatcher;
+ import android.os.Process;
+ import android.os.SystemClock;
+ 
+-import com.google.android.gms.auth.GoogleAuthException;
+-import com.google.android.gms.auth.GoogleAuthUtil;
+-import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
+ import com.google.android.gms.common.ConnectionResult;
+ import com.google.android.gms.common.GoogleApiAvailability;
+ 
+@@ -117,48 +114,18 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+         // so don't report any accounts if Google Play Services are out of date.
+         checkCanUseGooglePlayServices();
+ 
+-        if (!hasGetAccountsPermission()) {
+-            return new Account[] {};
+-        }
+-        long now = SystemClock.elapsedRealtime();
+-        Account[] accounts = mAccountManager.getAccountsByType(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE);
+-        long elapsed = SystemClock.elapsedRealtime() - now;
+-        recordElapsedTimeHistogram("Signin.AndroidGetAccountsTime_AccountManager", elapsed);
+-        if (ThreadUtils.runningOnUiThread()) {
+-            recordElapsedTimeHistogram(
+-                    "Signin.AndroidGetAccountsTimeUiThread_AccountManager", elapsed);
+-        }
+-        return accounts;
++        return new Account[] {};
+     }
+ 
+     @Override
+     public String getAuthToken(Account account, String authTokenScope) throws AuthException {
+         assert !ThreadUtils.runningOnUiThread();
+         assert AccountManagerFacade.GOOGLE_ACCOUNT_TYPE.equals(account.type);
+-        try {
+-            return GoogleAuthUtil.getTokenWithNotification(
+-                    ContextUtils.getApplicationContext(), account, authTokenScope, null);
+-        } catch (GoogleAuthException ex) {
+-            // This case includes a UserRecoverableNotifiedException, but most clients will have
+-            // their own retry mechanism anyway.
+-            throw new AuthException(AuthException.NONTRANSIENT,
+-                    "Error while getting token for scope '" + authTokenScope + "'", ex);
+-        } catch (IOException ex) {
+-            throw new AuthException(AuthException.TRANSIENT, ex);
+-        }
++        return null;
+     }
+ 
+     @Override
+-    public void invalidateAuthToken(String authToken) throws AuthException {
+-        try {
+-            GoogleAuthUtil.clearToken(ContextUtils.getApplicationContext(), authToken);
+-        } catch (GooglePlayServicesAvailabilityException ex) {
+-            throw new AuthException(AuthException.NONTRANSIENT, ex);
+-        } catch (GoogleAuthException ex) {
+-            throw new AuthException(AuthException.NONTRANSIENT, ex);
+-        } catch (IOException ex) {
+-            throw new AuthException(AuthException.TRANSIENT, ex);
+-        }
++    public void invalidateAuthToken(String authToken) {
+     }
+ 
+     @Override
+@@ -198,17 +165,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+     @SuppressLint("MissingPermission")
+     @Override
+     public void createAddAccountIntent(Callback<Intent> callback) {
+-        AccountManagerCallback<Bundle> accountManagerCallback = accountManagerFuture -> {
+-            try {
+-                Bundle bundle = accountManagerFuture.getResult();
+-                callback.onResult(bundle.getParcelable(AccountManager.KEY_INTENT));
+-            } catch (OperationCanceledException | IOException | AuthenticatorException e) {
+-                Log.e(TAG, "Error while creating an intent to add an account: ", e);
+-                callback.onResult(null);
+-            }
+-        };
+-        mAccountManager.addAccount(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE, null, null, null, null,
+-                accountManagerCallback, null);
+     }
+ 
+     // No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs
+-- 
+2.11.0
+

build/patches/kill-GCM.patch

@@ -3,69 +3,55 @@ Date: Fri, 22 Jun 2018 17:11:38 +0200
 Subject: kill GCM
 
 ---
- build/secondary/third_party/android_tools/BUILD.gn |  2 -
- .../third_party/android_tools/support/BUILD.gn     |  5 --
- chrome/android/BUILD.gn                            |  1 -
- chrome/android/java/AndroidManifest.xml            | 62 ----------------------
- .../chrome/browser/BackgroundSyncLauncher.java     | 16 +++---
- .../invalidation/InvalidationController.java       | 13 +----
- .../browser/ntp/snippets/SnippetsLauncher.java     | 44 ---------------
- .../browser/services/gcm/GCMBackgroundTask.java    |  2 -
- .../gcm/InvalidationGcmUpstreamSender.java         |  3 +-
- chrome/android/java_sources.gni                    |  2 -
- components/background_task_scheduler/BUILD.gn      |  1 -
- .../BackgroundTaskSchedulerGcmNetworkManager.java  | 30 ++++-------
- components/gcm_driver/android/BUILD.gn             |  1 -
- components/gcm_driver/instance_id/android/BUILD.gn |  1 -
- .../gcm_driver/instance_id/InstanceIDBridge.java   | 29 ++--------
- components/sync/android/BUILD.gn                   |  1 -
- third_party/cacheinvalidation/BUILD.gn             |  6 ---
- .../client/contrib/MultiplexingGcmListener.java    | 49 ++---------------
- .../android2/channel/AndroidNetworkChannel.java    | 18 +++----
- 19 files changed, 34 insertions(+), 252 deletions(-)
+ build/secondary/third_party/android_tools/BUILD.gn |   3 -
+ chrome/android/BUILD.gn                            |   1 -
+ chrome/android/java/AndroidManifest.xml            |  62 ---------
+ .../chrome/browser/BackgroundSyncLauncher.java     |  97 --------------
+ .../chrome/browser/ChromeBackgroundService.java    |   1 -
+ .../invalidation/InvalidationController.java       |  13 --
+ .../browser/ntp/snippets/SnippetsLauncher.java     |  44 -------
+ .../browser/services/gcm/GCMBackgroundTask.java    |   2 -
+ .../gcm/InvalidationGcmUpstreamSender.java         |  15 ---
+ chrome/android/java_sources.gni                    |   2 -
+ components/background_task_scheduler/BUILD.gn      |   1 -
+ .../BackgroundTaskSchedulerGcmNetworkManager.java  | 146 +--------------------
+ components/gcm_driver/android/BUILD.gn             |   1 -
+ components/gcm_driver/instance_id/android/BUILD.gn |   1 -
+ .../gcm_driver/instance_id/InstanceIDBridge.java   |  31 +----
+ components/sync/android/BUILD.gn                   |   1 -
+ third_party/cacheinvalidation/BUILD.gn             |   6 -
+ .../client/contrib/MultiplexingGcmListener.java    |  92 +------------
+ .../android2/channel/AndroidNetworkChannel.java    |  18 +--
+ 19 files changed, 14 insertions(+), 523 deletions(-)
 
 diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
 --- a/build/secondary/third_party/android_tools/BUILD.gn
 +++ b/build/secondary/third_party/android_tools/BUILD.gn
-@@ -43,8 +43,6 @@ if (enable_java_templates) {
-   support_lib_alias("android_support_chromium_java") {
+@@ -53,9 +53,6 @@ if (enable_java_templates) {
      testonly = true
+     java_files = [ "//third_party/android_tools/sdk/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
    }
--  support_lib_alias("android_gcm_java") {
+-  android_java_prebuilt("android_gcm_java") {
+-    jar_path = "//third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar"
 -  }
-   support_lib_alias("emma_device_java") {
-   }
-   prebuilt_wrapper("android_arch_lifecycle_common_java") {
-diff --git a/build/secondary/third_party/android_tools/support/BUILD.gn b/build/secondary/third_party/android_tools/support/BUILD.gn
---- a/build/secondary/third_party/android_tools/support/BUILD.gn
-+++ b/build/secondary/third_party/android_tools/support/BUILD.gn
-@@ -21,11 +21,6 @@ android_library("android_support_chromium_java") {
-   visibility += [ "//third_party/android_tools:*" ]
- }
- 
--android_java_prebuilt("android_gcm_java") {
--  jar_path = "//third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar"
--  visibility += [ "//third_party/android_tools:*" ]
--}
--
- android_java_prebuilt("emma_device_java") {
-   jar_path = "//third_party/android_tools/sdk/tools/lib/emma_device.jar"
-   include_java_resources = true
+   android_java_prebuilt("emma_device_java") {
+     jar_path = "//third_party/android_tools/sdk/tools/lib/emma_device.jar"
+     include_java_resources = true
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -261,7 +261,6 @@ android_library("chrome_java") {
+@@ -308,7 +308,6 @@ android_library("chrome_java") {
+     "//third_party/android_deps:javax_inject_javax_inject_java",
+     "//third_party/android_media:android_media_java",
      "//third_party/android_swipe_refresh:android_swipe_refresh_java",
-     "//third_party/android_tools:android_arch_lifecycle_common_java",
-     "//third_party/android_tools:android_arch_lifecycle_runtime_java",
 -    "//third_party/android_tools:android_gcm_java",
-     "//third_party/android_tools:android_support_annotations_java",
-     "//third_party/android_tools:android_support_compat_java",
-     "//third_party/android_tools:android_support_design_java",
+     "//third_party/blink/public:android_mojo_bindings_java",
+     "//third_party/blink/public:blink_headers_java",
+     "//third_party/blink/public/mojom:android_mojo_bindings_java",
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -72,22 +72,17 @@ by a child template that "extends" this file.
+@@ -77,22 +77,17 @@ by a child template that "extends" this file.
      <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
      <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
      <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@@ -88,7 +74,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
  
      <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
-@@ -886,43 +881,6 @@ by a child template that "extends" this file.
+@@ -911,43 +906,6 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
              android:hardwareAccelerated="false" />
  
@@ -132,7 +118,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <!-- Notification service for sync. -->
          <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
              android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
-@@ -934,8 +892,6 @@ by a child template that "extends" this file.
+@@ -959,8 +917,6 @@ by a child template that "extends" this file.
          </service>
          <service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
              android:exported="false"/>
@@ -141,7 +127,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
          <receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
              android:exported="false"/>
          <receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
-@@ -962,24 +918,6 @@ by a child template that "extends" this file.
+@@ -987,24 +943,6 @@ by a child template that "extends" this file.
              android:exported="false"
              android:permission="android.permission.BIND_JOB_SERVICE"/>
  
@@ -169,8 +155,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
-@@ -9,10 +9,6 @@ import android.content.SharedPreferences;
- import android.os.AsyncTask;
+@@ -8,10 +8,6 @@ import android.content.Context;
+ import android.content.SharedPreferences;
  import android.os.StrictMode;
  
 -import com.google.android.gms.gcm.GcmNetworkManager;
@@ -189,23 +175,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
      /**
       * Disables the automatic use of the GCMNetworkManager. When disabled, the methods which
       * interact with GCM can still be used, but will not be called automatically on creation, or by
-@@ -123,6 +117,7 @@ public class BackgroundSyncLauncher {
+@@ -124,30 +118,6 @@ public class BackgroundSyncLauncher {
      @VisibleForTesting
      @CalledByNative
      protected void launchBrowserIfStopped(final boolean shouldLaunch, final long minDelayMs) {
-+    /*
-         mLaunchBrowserIfStoppedTask = new AsyncTask<Void, Void, Void>() {
-             @Override
-             protected Void doInBackground(Void... params) {
-@@ -147,6 +142,7 @@ public class BackgroundSyncLauncher {
-                 }
-             }
-         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-+        */
+-        mLaunchBrowserIfStoppedTask = new AsyncTask<Void>() {
+-            @Override
+-            protected Void doInBackground() {
+-                SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
+-                prefs.edit()
+-                        .putBoolean(PREF_BACKGROUND_SYNC_LAUNCH_NEXT_ONLINE, shouldLaunch)
+-                        .apply();
+-                return null;
+-            }
+-            @Override
+-            protected void onPostExecute(Void params) {
+-                if (sGCMEnabled) {
+-                    if (shouldLaunch) {
+-                        RecordHistogram.recordBooleanHistogram(
+-                                "BackgroundSync.LaunchTask.ScheduleSuccess",
+-                                scheduleLaunchTask(mScheduler, minDelayMs));
+-                    } else {
+-                        RecordHistogram.recordBooleanHistogram(
+-                                "BackgroundSync.LaunchTask.CancelSuccess",
+-                                removeScheduledTasks(mScheduler));
+-                    }
+-                }
+-            }
+-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
      }
  
      /**
-@@ -158,7 +154,6 @@ public class BackgroundSyncLauncher {
+@@ -159,7 +129,6 @@ public class BackgroundSyncLauncher {
      }
  
      protected BackgroundSyncLauncher() {
@@ -213,45 +214,94 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
          launchBrowserIfStopped(false, 0);
      }
  
-@@ -186,7 +181,7 @@ public class BackgroundSyncLauncher {
-         }
+@@ -188,72 +157,6 @@ public class BackgroundSyncLauncher {
          return !sGCMEnabled;
      }
+ 
+-    private static boolean scheduleLaunchTask(GcmNetworkManager scheduler, long minDelayMs) {
+-        // Google Play Services may not be up to date, if the application was not installed through
+-        // the Play Store. In this case, scheduling the task will fail silently.
+-        final long minDelaySecs = minDelayMs / 1000;
+-        OneoffTask oneoff = new OneoffTask.Builder()
+-                                    .setService(ChromeBackgroundService.class)
+-                                    .setTag(TASK_TAG)
+-                                    // We have to set a non-zero execution window here
+-                                    .setExecutionWindow(minDelaySecs, minDelaySecs + 1)
+-                                    .setRequiredNetwork(Task.NETWORK_STATE_CONNECTED)
+-                                    .setPersisted(true)
+-                                    .setUpdateCurrent(true)
+-                                    .build();
+-        try {
+-            scheduler.schedule(oneoff);
+-        } catch (IllegalArgumentException e) {
+-            // Disable GCM for the remainder of this session.
+-            setGCMEnabled(false);
+-            // Return false so that the failure will be logged.
+-            return false;
+-        }
+-        return true;
+-    }
 -
-+	/*
-     private static boolean scheduleLaunchTask(GcmNetworkManager scheduler, long minDelayMs) {
-         // Google Play Services may not be up to date, if the application was not installed through
-         // the Play Store. In this case, scheduling the task will fail silently.
-@@ -229,7 +224,7 @@ public class BackgroundSyncLauncher {
-         }
-         return true;
-     }
+-    private static boolean removeScheduledTasks(GcmNetworkManager scheduler) {
+-        // Third-party code causes broadcast to touch disk. http://crbug.com/614679
+-        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+-        try {
+-            scheduler.cancelTask(TASK_TAG, ChromeBackgroundService.class);
+-        } catch (IllegalArgumentException e) {
+-            // This occurs when BackgroundSyncLauncherService is not found in the application
+-            // manifest. This should not happen in code that reaches here, but has been seen in
+-            // the past. See https://crbug.com/548314
+-            // Disable GCM for the remainder of this session.
+-            setGCMEnabled(false);
+-            // Return false so that the failure will be logged.
+-            return false;
+-        } finally {
+-            StrictMode.setThreadPolicy(oldPolicy);
+-        }
+-        return true;
+-    }
 -
-+	*/
-     /**
-      * Reschedule any required background sync tasks, if they have been removed due to an
-      * application upgrade.
-@@ -239,6 +234,7 @@ public class BackgroundSyncLauncher {
-      * This method is static so that it can be run without actually instantiating a
-      * BackgroundSyncLauncher.
-      */
-+     /*
-     protected static void rescheduleTasksOnUpgrade(final Context context) {
-         final GcmNetworkManager scheduler = GcmNetworkManager.getInstance(context);
-         BackgroundSyncLauncher.ShouldLaunchCallback callback = shouldLaunch -> {
-@@ -252,7 +248,7 @@ public class BackgroundSyncLauncher {
-         };
-         BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(callback);
-     }
+-    /**
+-     * Reschedule any required background sync tasks, if they have been removed due to an
+-     * application upgrade.
+-     *
+-     * This method checks the saved preferences, and reschedules the sync tasks as appropriate
+-     * to match the preferences.
+-     * This method is static so that it can be run without actually instantiating a
+-     * BackgroundSyncLauncher.
+-     */
+-    protected static void rescheduleTasksOnUpgrade(final Context context) {
+-        final GcmNetworkManager scheduler = GcmNetworkManager.getInstance(context);
+-        BackgroundSyncLauncher.ShouldLaunchCallback callback = shouldLaunch -> {
+-            if (shouldLaunch) {
+-                // It's unclear what time the sync event was supposed to fire, so fire
+-                // without delay and let the browser reschedule if necessary.
+-                // TODO(iclelland): If this fails, report the failure via UMA (not now,
+-                // since the browser is not running, but on next startup.)
+-                scheduleLaunchTask(scheduler, 0);
+-            }
+-        };
+-        BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(callback);
+-    }
 -
-+	*/
      @VisibleForTesting
      static void setGCMEnabled(boolean enabled) {
          sGCMEnabled = enabled;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+@@ -106,7 +106,6 @@ public class ChromeBackgroundService extends GcmTaskService {
+ 
+     @VisibleForTesting
+     protected void rescheduleBackgroundSyncTasksOnUpgrade() {
+-        BackgroundSyncLauncher.rescheduleTasksOnUpgrade(this);
+     }
+ 
+     private void handleSnippetsOnBrowserUpgraded() {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
-@@ -12,8 +12,6 @@ import android.os.Build;
+@@ -10,8 +10,6 @@ import android.os.Build;
  import android.os.Handler;
  import android.os.SystemClock;
  
@@ -259,22 +309,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/In
 -
  import org.chromium.base.ApplicationState;
  import org.chromium.base.ApplicationStatus;
- import org.chromium.base.FieldTrialList;
-@@ -201,16 +199,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
+ import org.chromium.base.ContextUtils;
+@@ -198,18 +196,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
       * Registers for Google Cloud Messaging (GCM) for Invalidations.
       */
      private void ensureGcmIsInitialized() {
 -        if (mGcmInitialized) return;
--        mGcmInitialized = true;
--        new AsyncTask<Void, Void, Void>() {
+         mGcmInitialized = true;
+-        new AsyncTask<Void>() {
 -            @Override
--            protected Void doInBackground(Void... arg0) {
+-            protected Void doInBackground() {
 -                boolean useGcmUpstream = true;
--                AndroidGcmController.get(mContext).initializeGcm(useGcmUpstream);
+-                AndroidGcmController.get(ContextUtils.getApplicationContext())
+-                        .initializeGcm(useGcmUpstream);
 -                return null;
 -            }
--        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-+        mGcmInitialized = false;
+-        }
+-                .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
      }
  
      @VisibleForTesting
@@ -386,34 +437,39 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GC
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
-@@ -13,7 +13,6 @@ import android.os.Parcel;
+@@ -12,7 +12,6 @@ import android.os.Parcel;
  import android.support.annotation.MainThread;
  import android.util.Log;
  
 -import com.google.android.gms.gcm.GoogleCloudMessaging;
  import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService;
  
- import org.chromium.base.ThreadUtils;
-@@ -92,6 +91,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
+ import org.chromium.base.ContextUtils;
+@@ -96,20 +95,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
       * This function runs on a thread from the AsyncTask.THREAD_POOL_EXECUTOR.
       */
      private void sendUpstreamMessage(String to, Bundle data, String token, Context context) {
-+    	/*
-         // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it.
-         data.putString("Authorization", "Bearer " + token);
-         if (!isMessageWithinLimit(data)) {
-@@ -105,6 +105,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
-             Log.w(TAG, "Send message failed");
-             GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SEND_FAILED);
-         }
-+        */
+-        // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it.
+-        data.putString("Authorization", "Bearer " + token);
+-        if (!isMessageWithinLimit(data)) {
+-            GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SIZE_LIMIT_EXCEEDED);
+-            return;
+-        }
+-        String msgId = UUID.randomUUID().toString();
+-        try {
+-            GoogleCloudMessaging.getInstance(ContextUtils.getApplicationContext())
+-                    .send(to, msgId, 1, data);
+-        } catch (IOException | IllegalArgumentException exception) {
+-            Log.w(TAG, "Send message failed");
+-            GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SEND_FAILED);
+-        }
      }
  
      private boolean isMessageWithinLimit(Bundle data) {
 diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 --- a/chrome/android/java_sources.gni
 +++ b/chrome/android/java_sources.gni
-@@ -22,7 +22,6 @@ chrome_java_sources = [
+@@ -27,7 +27,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/ChromeActivity.java",
    "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
    "java/src/org/chromium/chrome/browser/ChromeApplication.java",
@@ -421,7 +477,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
    "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
    "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
    "java/src/org/chromium/chrome/browser/ChromeFeatureList.java",
-@@ -1112,7 +1111,6 @@ chrome_java_sources = [
+@@ -1344,7 +1343,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
    "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
    "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
@@ -432,7 +488,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
 --- a/components/background_task_scheduler/BUILD.gn
 +++ b/components/background_task_scheduler/BUILD.gn
-@@ -23,7 +23,6 @@ if (is_android) {
+@@ -30,7 +30,6 @@ if (is_android) {
    android_library("background_task_scheduler_java") {
      java_files = [
        "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java",
@@ -458,71 +514,152 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
  import org.chromium.base.Log;
  import org.chromium.base.ThreadUtils;
  import org.chromium.base.VisibleForTesting;
-@@ -33,7 +25,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-     static final String BACKGROUND_TASK_CLASS_KEY = "_background_task_class";
+@@ -34,104 +26,6 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
      @VisibleForTesting
      static final String BACKGROUND_TASK_EXTRAS_KEY = "_background_task_extras";
--
-+    /*
-     static BackgroundTask getBackgroundTaskFromTaskParams(@NonNull TaskParams taskParams) {
-         String backgroundTaskClassName = getBackgroundTaskClassFromTaskParams(taskParams);
-         return BackgroundTaskReflection.getBackgroundTaskFromClassName(backgroundTaskClassName);
-@@ -44,7 +36,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-         if (extras == null) return null;
-         return extras.getString(BACKGROUND_TASK_CLASS_KEY);
-     }
--
-+    */
-     /**
-      * Retrieves the {@link TaskParameters} from the {@link TaskParams}, which are passed as
-      * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
-@@ -53,6 +45,8 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-      * @param taskParams the {@link TaskParams} to extract the {@link TaskParameters} from.
-      * @return the {@link TaskParameters} for the current job.
-      */
-+     
-+    /*
-     static TaskParameters getTaskParametersFromTaskParams(@NonNull TaskParams taskParams) {
-         int taskId;
-         try {
-@@ -132,6 +126,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-         return Task.NETWORK_STATE_ANY;
-     }
  
-+    */
+-    static BackgroundTask getBackgroundTaskFromTaskParams(@NonNull TaskParams taskParams) {
+-        String backgroundTaskClassName = getBackgroundTaskClassFromTaskParams(taskParams);
+-        return BackgroundTaskReflection.getBackgroundTaskFromClassName(backgroundTaskClassName);
+-    }
+-
+-    private static String getBackgroundTaskClassFromTaskParams(@NonNull TaskParams taskParams) {
+-        Bundle extras = taskParams.getExtras();
+-        if (extras == null) return null;
+-        return extras.getString(BACKGROUND_TASK_CLASS_KEY);
+-    }
+-
+-    /**
+-     * Retrieves the {@link TaskParameters} from the {@link TaskParams}, which are passed as
+-     * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
+-     * values are stripped at the time when the task is scheduled.
+-     *
+-     * @param taskParams the {@link TaskParams} to extract the {@link TaskParameters} from.
+-     * @return the {@link TaskParameters} for the current job.
+-     */
+-    static TaskParameters getTaskParametersFromTaskParams(@NonNull TaskParams taskParams) {
+-        int taskId;
+-        try {
+-            taskId = Integer.parseInt(taskParams.getTag());
+-        } catch (NumberFormatException e) {
+-            Log.e(TAG, "Cound not parse task ID from task tag: " + taskParams.getTag());
+-            return null;
+-        }
+-
+-        TaskParameters.Builder builder = TaskParameters.create(taskId);
+-
+-        Bundle extras = taskParams.getExtras();
+-        Bundle taskExtras = extras.getBundle(BACKGROUND_TASK_EXTRAS_KEY);
+-        builder.addExtras(taskExtras);
+-
+-        return builder.build();
+-    }
+-
+-    @VisibleForTesting
+-    static Task createTaskFromTaskInfo(@NonNull TaskInfo taskInfo) {
+-        Bundle taskExtras = new Bundle();
+-        taskExtras.putString(
+-                BACKGROUND_TASK_CLASS_KEY, taskInfo.getBackgroundTaskClass().getName());
+-        taskExtras.putBundle(BACKGROUND_TASK_EXTRAS_KEY, taskInfo.getExtras());
+-
+-        Task.Builder builder;
+-        if (taskInfo.isPeriodic()) {
+-            builder = getPeriodicTaskBuilder(taskInfo.getPeriodicInfo());
+-        } else {
+-            builder = getOneOffTaskBuilder(taskInfo.getOneOffInfo());
+-        }
+-
+-        builder.setExtras(taskExtras)
+-                .setPersisted(taskInfo.isPersisted())
+-                .setRequiredNetwork(getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType(
+-                        taskInfo.getRequiredNetworkType()))
+-                .setRequiresCharging(taskInfo.requiresCharging())
+-                .setService(BackgroundTaskGcmTaskService.class)
+-                .setTag(taskIdToTaskTag(taskInfo.getTaskId()))
+-                .setUpdateCurrent(taskInfo.shouldUpdateCurrent());
+-
+-        return builder.build();
+-    }
+-
+-    private static Task.Builder getPeriodicTaskBuilder(TaskInfo.PeriodicInfo periodicInfo) {
+-        PeriodicTask.Builder builder = new PeriodicTask.Builder();
+-        builder.setPeriod(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getIntervalMs()));
+-        if (periodicInfo.hasFlex()) {
+-            builder.setFlex(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getFlexMs()));
+-        }
+-        return builder;
+-    }
+-
+-    private static Task.Builder getOneOffTaskBuilder(TaskInfo.OneOffInfo oneOffInfo) {
+-        OneoffTask.Builder builder = new OneoffTask.Builder();
+-        long windowStartSeconds = oneOffInfo.hasWindowStartTimeConstraint()
+-                ? TimeUnit.MILLISECONDS.toSeconds(oneOffInfo.getWindowStartTimeMs())
+-                : 0;
+-        builder.setExecutionWindow(windowStartSeconds,
+-                TimeUnit.MILLISECONDS.toSeconds(oneOffInfo.getWindowEndTimeMs()));
+-        return builder;
+-    }
+-
+-    private static int getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType(
+-            @TaskInfo.NetworkType int networkType) {
+-        switch (networkType) {
+-            // This is correct: GcmNM ANY means no network is guaranteed.
+-            case TaskInfo.NETWORK_TYPE_NONE:
+-                return Task.NETWORK_STATE_ANY;
+-            case TaskInfo.NETWORK_TYPE_ANY:
+-                return Task.NETWORK_STATE_CONNECTED;
+-            case TaskInfo.NETWORK_TYPE_UNMETERED:
+-                return Task.NETWORK_STATE_UNMETERED;
+-            default:
+-                assert false;
+-        }
+-        return Task.NETWORK_STATE_ANY;
+-    }
+-
      @Override
      public boolean schedule(Context context, @NonNull TaskInfo taskInfo) {
          ThreadUtils.assertOnUiThread();
-@@ -142,6 +137,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+@@ -142,50 +36,12 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
                              + " has no parameterless public constructor.");
              return false;
          }
-+        /*
- 
-         GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
-         if (gcmNetworkManager == null) {
-@@ -158,14 +154,15 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-                     "GcmNetworkManager failed to schedule task, gcm message: " + gcmErrorMessage);
-             return false;
-         }
+-
+-        GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
+-        if (gcmNetworkManager == null) {
+-            Log.e(TAG, "GcmNetworkManager is not available.");
+-            return false;
+-        }
+-
+-        try {
+-            Task task = createTaskFromTaskInfo(taskInfo);
+-            gcmNetworkManager.schedule(task);
+-        } catch (IllegalArgumentException e) {
+-            String gcmErrorMessage = e.getMessage() == null ? "null." : e.getMessage();
+-            Log.e(TAG,
+-                    "GcmNetworkManager failed to schedule task, gcm message: " + gcmErrorMessage);
+-            return false;
+-        }
 -
 -        return true;
-+		*/
 +        return false;
      }
  
      @Override
      public void cancel(Context context, int taskId) {
          ThreadUtils.assertOnUiThread();
- 
-+        /*
-         GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
-         if (gcmNetworkManager == null) {
-             Log.e(TAG, "GcmNetworkManager is not available.");
-@@ -178,14 +175,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
-         } catch (IllegalArgumentException e) {
-             Log.e(TAG, "GcmNetworkManager failed to cancel task.");
-         }
+-
+-        GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
+-        if (gcmNetworkManager == null) {
+-            Log.e(TAG, "GcmNetworkManager is not available.");
+-            return;
+-        }
+-
+-        try {
+-            gcmNetworkManager.cancelTask(
+-                    taskIdToTaskTag(taskId), BackgroundTaskGcmTaskService.class);
+-        } catch (IllegalArgumentException e) {
+-            Log.e(TAG, "GcmNetworkManager failed to cancel task.");
+-        }
 -    }
 -
 -    private GcmNetworkManager getGcmNetworkManager(Context context) {
@@ -531,7 +668,6 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
 -            return GcmNetworkManager.getInstance(context);
 -        }
 -        return null;
-+        */
      }
  
      private static String taskIdToTaskTag(int taskId) {
@@ -560,7 +696,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm
 diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
 --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
 +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
-@@ -26,7 +26,6 @@ public class InstanceIDBridge {
+@@ -32,7 +32,6 @@ public class InstanceIDBridge {
       * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be
       * initialized on a background thread.
       */
@@ -568,7 +704,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
  
      private static boolean sBlockOnAsyncTasksForTesting;
  
-@@ -71,7 +70,7 @@ public class InstanceIDBridge {
+@@ -108,7 +107,7 @@ public class InstanceIDBridge {
          new BridgeAsyncTask<String>() {
              @Override
              protected String doBackgroundWork() {
@@ -577,7 +713,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
              }
              @Override
              protected void sendResultToNative(String id) {
-@@ -86,7 +85,7 @@ public class InstanceIDBridge {
+@@ -123,7 +122,7 @@ public class InstanceIDBridge {
          new BridgeAsyncTask<Long>() {
              @Override
              protected Long doBackgroundWork() {
@@ -586,11 +722,12 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
              }
              @Override
              protected void sendResultToNative(Long creationTime) {
-@@ -107,11 +106,7 @@ public class InstanceIDBridge {
+@@ -148,12 +147,7 @@ public class InstanceIDBridge {
          new BridgeAsyncTask<String>() {
              @Override
              protected String doBackgroundWork() {
 -                try {
+-                    storeLazinessInformation(authorizedEntity, isLazy);
 -                    return mInstanceID.getToken(authorizedEntity, scope, extras);
 -                } catch (IOException ex) {
 -                    return "";
@@ -599,7 +736,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
              }
              @Override
              protected void sendResultToNative(String token) {
-@@ -127,12 +122,7 @@ public class InstanceIDBridge {
+@@ -169,12 +163,7 @@ public class InstanceIDBridge {
          new BridgeAsyncTask<Boolean>() {
              @Override
              protected Boolean doBackgroundWork() {
@@ -613,7 +750,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
              }
              @Override
              protected void sendResultToNative(Boolean success) {
-@@ -147,12 +137,7 @@ public class InstanceIDBridge {
+@@ -189,12 +178,7 @@ public class InstanceIDBridge {
          new BridgeAsyncTask<Boolean>() {
              @Override
              protected Boolean doBackgroundWork() {
@@ -627,28 +764,29 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
              }
              @Override
              protected void sendResultToNative(Boolean success) {
-@@ -192,10 +177,6 @@ public class InstanceIDBridge {
+@@ -233,11 +217,6 @@ public class InstanceIDBridge {
+                 @Override
                  @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
-                 protected Result doInBackground(Void... params) {
-                     synchronized (InstanceIDBridge.this) {
+                 protected Result doInBackground() {
+-                    synchronized (InstanceIDBridge.this) {
 -                        if (mInstanceID == null) {
--                            mInstanceID = InstanceIDWithSubtype.getInstance(
--                                    ContextUtils.getApplicationContext(), mSubtype);
+-                            mInstanceID = InstanceIDWithSubtype.getInstance(mSubtype);
 -                        }
-                     }
+-                    }
                      return doBackgroundWork();
                  }
+                 @Override
 diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
 --- a/components/sync/android/BUILD.gn
 +++ b/components/sync/android/BUILD.gn
-@@ -10,7 +10,6 @@ android_library("sync_java") {
-     "//base:base_java",
+@@ -11,7 +11,6 @@ android_library("sync_java") {
      "//components/signin/core/browser/android:java",
      "//net/android:net_java",
+     "//third_party/android_deps:android_support_annotations_java",
 -    "//third_party/android_tools:android_gcm_java",
-     "//third_party/android_tools:android_support_annotations_java",
      "//third_party/cacheinvalidation:cacheinvalidation_javalib",
      "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
+     "//third_party/jsr-305:jsr_305_javalib",
 diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
 --- a/third_party/cacheinvalidation/BUILD.gn
 +++ b/third_party/cacheinvalidation/BUILD.gn
@@ -715,19 +853,54 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
     * Convenience base class for client implementations. It provides base classes for a broadcast
     * receiver and an intent service that work together to handle events from the
     * {@code MultiplexingGcmListener} while holding a wake lock.
-@@ -261,7 +246,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+@@ -260,85 +245,10 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+   /** Logger. */
    private static final Logger logger = AndroidLogger.forTag("MplexGcmListener");
  
-   // All onYYY methods work by constructing an appropriate Intent and broadcasting it.
+-  // All onYYY methods work by constructing an appropriate Intent and broadcasting it.
 -
-+	/*
-   @Override
-   protected void onMessage(Context context, Intent intent) {
-     Intent newIntent = new Intent();
-@@ -304,35 +289,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
-   protected String[] getSenderIds(Context context) {
-     return readSenderIdsFromManifestOrDie(this);
-   }
+-  @Override
+-  protected void onMessage(Context context, Intent intent) {
+-    Intent newIntent = new Intent();
+-    newIntent.putExtra(Intents.EXTRA_OP_MESSAGE, true);
+-    newIntent.putExtras(intent);
+-    rebroadcast(newIntent);
+-  }
+-
+-  @Override
+-  protected void onRegistered(Context context, String registrationId) {
+-    Intent intent = new Intent();
+-    intent.putExtra(Intents.EXTRA_OP_REGISTERED, true);
+-    intent.putExtra(Intents.EXTRA_DATA_REG_ID, registrationId);
+-    rebroadcast(intent);
+-  }
+-
+-  @Override
+-  protected void onUnregistered(Context context, String registrationId) {
+-    Intent intent = new Intent();
+-    intent.putExtra(Intents.EXTRA_OP_UNREGISTERED, true);
+-    intent.putExtra(Intents.EXTRA_DATA_REG_ID, registrationId);
+-    rebroadcast(intent);
+-  }
+-
+-  @Override
+-  protected void onDeletedMessages(Context context, int total) {
+-    Intent intent = new Intent();
+-    intent.putExtra(Intents.EXTRA_OP_DELETED_MESSAGES, true);
+-    intent.putExtra(Intents.EXTRA_DATA_NUM_DELETED_MSGS, total);
+-    rebroadcast(intent);
+-  }
+-
+-  @Override
+-  protected void onError(Context context, String errorId) {
+-    // This is called for unrecoverable errors, so just log a warning.
+-    logger.warning("GCM error: %s", errorId);
+-  }
+-
+-  @Override
+-  protected String[] getSenderIds(Context context) {
+-    return readSenderIdsFromManifestOrDie(this);
+-  }
 -
 -  /**
 -   * Broadcasts {@code intent} with the action set to {@link Intents#ACTION} and the package name
@@ -757,10 +930,15 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
 -    }
 -    return regId;
 -  }
-+	*/
- 
+-
    /**
     * Returns the GCM sender ids from {@link #GCM_SENDER_IDS_METADATA_KEY} or throws a
+    * {@code RuntimeException} if they are not defined.
+    */
+-  
+   static String[] readSenderIdsFromManifestOrDie(Context context) {
+     try {
+       ServiceInfo serviceInfo = context.getPackageManager().getServiceInfo(
 diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
 --- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
 +++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
@@ -796,5 +974,5 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
    }
  }
 -- 
-2.7.4
+2.11.0
 

build/patches/kill-Location-fall-back-to-system.patch

@@ -0,0 +1,48 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:05:17 +0200
+Subject: kill Location, fall back to system
+
+---
+ services/device/geolocation/BUILD.gn                           |  1 -
+ .../chromium/device/geolocation/LocationProviderFactory.java   | 10 ++--------
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
+--- a/services/device/geolocation/BUILD.gn
++++ b/services/device/geolocation/BUILD.gn
+@@ -131,7 +131,6 @@ if (is_android) {
+       "android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
+       "android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
+       "android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",
+-      "android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java",
+     ]
+ 
+     deps = [
+diff --git a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
+--- a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
++++ b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
+@@ -26,19 +26,13 @@ public class LocationProviderFactory {
+ 
+     @CalledByNative
+     public static void useGmsCoreLocationProvider() {
+-        sUseGmsCoreLocationProvider = true;
++        sUseGmsCoreLocationProvider = false;
+     }
+ 
+     public static LocationProvider create() {
+         if (sProviderImpl != null) return sProviderImpl;
+ 
+-        if (sUseGmsCoreLocationProvider
+-                && LocationProviderGmsCore.isGooglePlayServicesAvailable(
+-                           ContextUtils.getApplicationContext())) {
+-            sProviderImpl = new LocationProviderGmsCore(ContextUtils.getApplicationContext());
+-        } else {
+-            sProviderImpl = new LocationProviderAndroid();
+-        }
++        sProviderImpl = new LocationProviderAndroid();
+         return sProviderImpl;
+     }
+ }
+-- 
+2.11.0
+

build/patches/kill-TOS-and-metrics-opt-out.patch

@@ -4,13 +4,14 @@ Subject: kill TOS and metrics opt-out
 
 ---
  chrome/android/java/res/layout/fre_tosanduma.xml                       | 3 ++-
+ chrome/android/java/res/values/dimens.xml                              | 1 -
  .../src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
 --- a/chrome/android/java/res/layout/fre_tosanduma.xml
 +++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -62,7 +62,8 @@
+@@ -63,7 +63,8 @@
                          android:layout_marginBottom="@dimen/fre_vertical_spacing"
                          android:gravity="center"
                          android:lineSpacingMultiplier="1.4"
@@ -20,6 +21,17 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
  
                      <CheckBox
                          android:id="@+id/send_report_checkbox"
+diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
+--- a/chrome/android/java/res/values/dimens.xml
++++ b/chrome/android/java/res/values/dimens.xml
+@@ -181,7 +181,6 @@
+     <dimen name="fre_stacked_button_margin">8dp</dimen>
+     <dimen name="fre_margin">24dp</dimen>
+     <dimen name="fre_image_height">120dp</dimen>
+-    <dimen name="fre_tos_checkbox_padding">12dp</dimen>
+ 
+     <!-- Account Signin dimensions -->
+     <!-- The Account Signin page appears in the First Run Experience (amongst other places), so uses
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
@@ -33,5 +45,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
      private boolean mNativeInitialized;
  
 -- 
-2.7.4
+2.11.0
 

build/patches/kill-Translate.patch

@@ -1,11 +1,11 @@
 From: thermatk <thermatk@thermatk.com>
 Date: Fri, 22 Jun 2018 17:16:43 +0200
-Subject: kill Translate(doesn't work)
+Subject: kill Translate
 
 ---
  chrome/android/java/res/xml/languages_preferences.xml                  | 3 ++-
- .../src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java     | 2 ++
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ .../src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java     | 3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
 --- a/chrome/android/java/res/xml/languages_preferences.xml
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/andr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.metrics.UmaUtils;
+@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.metrics.UmaUtils;
  import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
  import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
@@ -30,14 +30,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
  import org.chromium.chrome.browser.search_engines.TemplateUrlService;
  import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
  import org.chromium.ui.base.LocalizationUtils;
-@@ -142,6 +143,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
-         if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
-             mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
-             notifyAdapter = true;
-+            PrefServiceBridge.getInstance().setTranslateEnabled(false);
-         }
+@@ -138,6 +139,8 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+         if (mPostNativePageSequenceCreated) return;
+         mFirstRunFlowSequencer.onNativeInitialized(mFreProperties);
  
-         // An optional page to select a default search engine.
++        PrefServiceBridge.getInstance().setTranslateEnabled(false);
++
+         boolean notifyAdapter = false;
+         // An optional Data Saver page.
+         if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
 -- 
-2.7.4
+2.11.0
 

build/patches/kill-Vision.patch

@@ -2,21 +2,23 @@ From: thermatk <thermatk@thermatk.com>
 Date: Fri, 22 Jun 2018 17:04:43 +0200
 Subject: kill Vision
 
+Barcode, face and text detection APIs
 ---
- services/shape_detection/BUILD.gn                            |  3 ---
- .../java/src/org/chromium/shape_detection/BitmapUtils.java   | 12 ------------
- .../chromium/shape_detection/FaceDetectionProviderImpl.java  |  2 +-
- .../src/org/chromium/shape_detection/InterfaceRegistrar.java |  2 --
- 4 files changed, 1 insertion(+), 18 deletions(-)
+ services/shape_detection/BUILD.gn                         |  4 ----
+ .../src/org/chromium/shape_detection/BitmapUtils.java     | 12 ------------
+ .../shape_detection/FaceDetectionProviderImpl.java        | 15 ++-------------
+ .../org/chromium/shape_detection/InterfaceRegistrar.java  |  5 -----
+ 4 files changed, 2 insertions(+), 34 deletions(-)
 
 diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
 --- a/services/shape_detection/BUILD.gn
 +++ b/services/shape_detection/BUILD.gn
-@@ -79,13 +79,10 @@ if (is_android) {
+@@ -86,14 +86,10 @@ if (is_android) {
  
    android_library("shape_detection_java") {
      java_files = [
 -      "android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java",
+-      "android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java",
        "android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java",
 -      "android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java",
        "android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java",
@@ -35,10 +37,10 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
  
 -import com.google.android.gms.vision.Frame;
 -
+ import org.chromium.mojo_base.BigBufferUtil;
  import org.chromium.skia.mojom.ColorType;
  
- import java.nio.ByteBuffer;
-@@ -41,14 +39,4 @@ public class BitmapUtils {
+@@ -44,14 +42,4 @@ public class BitmapUtils {
  
          return bitmap;
      }
@@ -56,28 +58,58 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
 diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
 --- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
 +++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
-@@ -30,7 +30,7 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider {
-                 == ConnectionResult.SUCCESS;
+@@ -4,9 +4,6 @@
  
-         if (isGmsCoreSupported) {
+ package org.chromium.shape_detection;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.mojo.bindings.InterfaceRequest;
+ import org.chromium.mojo.system.MojoException;
+@@ -24,16 +21,8 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider {
+     @Override
+     public void createFaceDetection(
+             InterfaceRequest<FaceDetection> request, FaceDetectorOptions options) {
+-        final boolean isGmsCoreSupported =
+-                GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                        ContextUtils.getApplicationContext())
+-                == ConnectionResult.SUCCESS;
+-
+-        if (isGmsCoreSupported) {
 -            FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
-+            //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
-         } else {
-             FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request);
-         }
+-        } else {
+-            FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request);
+-        }
++
++        FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request);
+     }
+ 
+     @Override
 diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
 --- a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
 +++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
-@@ -20,9 +20,7 @@ class InterfaceRegistrar {
-         // is not necessary to hold on to a reference to it explicitly.
+@@ -8,9 +8,7 @@ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.annotations.JNINamespace;
+ import org.chromium.mojo.system.impl.CoreImpl;
+ import org.chromium.services.service_manager.InterfaceRegistry;
+-import org.chromium.shape_detection.mojom.BarcodeDetectionProvider;
+ import org.chromium.shape_detection.mojom.FaceDetectionProvider;
+-import org.chromium.shape_detection.mojom.TextDetection;
+ 
+ @JNINamespace("shape_detection")
+ class InterfaceRegistrar {
+@@ -21,9 +19,6 @@ class InterfaceRegistrar {
          InterfaceRegistry registry = InterfaceRegistry.create(
                  CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle());
--        registry.addInterface(BarcodeDetection.MANAGER, new BarcodeDetectionImpl.Factory());
          registry.addInterface(
+-                BarcodeDetectionProvider.MANAGER, new BarcodeDetectionProviderImpl.Factory());
+-        registry.addInterface(
                  FaceDetectionProvider.MANAGER, new FaceDetectionProviderImpl.Factory());
 -        registry.addInterface(TextDetection.MANAGER, new TextDetectionImpl.Factory());
      }
  }
 -- 
-2.7.4
+2.11.0
 

build/patches/net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch

@@ -11,7 +11,7 @@ it as hidden as it was before?
 diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
 --- a/net/cert/x509_util.cc
 +++ b/net/cert/x509_util.cc
-@@ -190,7 +190,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate,
+@@ -191,7 +191,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate,
  }
  
  // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
@@ -21,5 +21,5 @@ diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
  // Certificates made by CreateKeyAndSelfSignedCert will be signed using this
  // digest algorithm.
 -- 
-2.7.4
+2.11.0
 

build/patches/openH264-enable-ARM-ARM64-optimizations.patch

@@ -59,7 +59,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
    if (!is_win || is_clang) {
      cflags += [
-@@ -128,6 +143,14 @@ source_set("common") {
+@@ -129,6 +144,14 @@ source_set("common") {
    }
    include_dirs = openh264_common_include_dirs
  
@@ -74,7 +74,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    configs -= [ "//build/config/compiler:chromium_code" ]
    configs += [ "//build/config/compiler:no_chromium_code" ]
    configs += [ ":config" ]
-@@ -154,6 +177,14 @@ source_set("processing") {
+@@ -155,6 +178,14 @@ source_set("processing") {
    }
    include_dirs = openh264_processing_include_dirs
  
@@ -89,7 +89,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    configs -= [ "//build/config/compiler:chromium_code" ]
    configs += [ "//build/config/compiler:no_chromium_code" ]
    configs += [ ":config" ]
-@@ -173,6 +204,14 @@ source_set("encoder") {
+@@ -174,6 +205,14 @@ source_set("encoder") {
    }
    include_dirs = openh264_encoder_include_dirs
  
@@ -105,5 +105,5 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
    configs += [ "//build/config/compiler:no_chromium_code" ]
    configs += [ ":config" ]
 -- 
-2.7.4
+2.11.0
 

build/patches/prefs-only-keep-cookies-until-exit.patch

@@ -10,7 +10,7 @@ Out with all those tracking cookies!
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() {
+@@ -118,7 +118,7 @@ void ContentSettingsRegistry::Init() {
    // WARNING: The string names of the permissions passed in below are used to
    // generate preference names and should never be changed!
  
@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
             WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
 -- 
-2.7.4
+2.11.0
 

build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch

@@ -16,7 +16,7 @@ any information.
 diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc
 --- a/chrome/browser/profile_resetter/reset_report_uploader.cc
 +++ b/chrome/browser/profile_resetter/reset_report_uploader.cc
-@@ -18,7 +18,7 @@
+@@ -19,7 +19,7 @@
  
  namespace {
  const char kResetReportUrl[] =
@@ -26,5 +26,5 @@ diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/b
  GURL GetClientReportUrl(const std::string& report_url) {
    GURL url(report_url);
 -- 
-2.7.4
+2.11.0
 

build/patches/promo-disable-Google-promotion-fetching.patch

@@ -22,7 +22,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/33
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -130,6 +130,7 @@ namespace signin {
+@@ -130,6 +130,7 @@ const char kSigninPromoLandingURLSuccessPage[] = "success.html";
  
  bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
    DCHECK(profile);
@@ -31,5 +31,5 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
    // Don't show if the profile is an incognito.
    if (profile->IsOffTheRecord())
 -- 
-2.7.4
+2.11.0
 

build/patches/safe_browsing-disable-cookie-transmission.patch

@@ -7,17 +7,17 @@ prevents the long-living tracking cookie from being set.
 
 References: https://github.com/iridium-browser/iridium-browser/issues/37
 ---
- chrome/browser/safe_browsing/client_side_detection_service.cc     | 4 ++--
- .../download_protection/check_client_download_request.cc          | 2 +-
- .../safe_browsing/download_protection/ppapi_download_request.cc   | 2 +-
- chrome/browser/safe_browsing/protocol_manager.cc                  | 8 ++++----
- components/safe_browsing/browser/threat_details_cache.cc          | 1 +
- 5 files changed, 9 insertions(+), 8 deletions(-)
+ chrome/browser/safe_browsing/client_side_detection_service.cc         | 4 ++--
+ .../download_protection/check_client_download_request.cc              | 2 +-
+ .../safe_browsing/download_protection/ppapi_download_request.cc       | 2 +-
+ components/safe_browsing/browser/threat_details_cache.cc              | 1 +
+ components/safe_browsing/db/v4_update_protocol_manager.cc             | 4 ++--
+ 5 files changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -348,7 +348,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+@@ -358,7 +358,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = GetClientReportUrl(kClientReportPhishingUrl);
    resource_request->method = "POST";
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
    auto loader = network::SimpleURLLoader::Create(std::move(resource_request),
                                                   traffic_annotation);
    loader->AttachStringForUpload(request_data, "application/octet-stream");
-@@ -430,7 +430,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -440,7 +440,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = GetClientReportUrl(kClientReportMalwareUrl);
    resource_request->method = "POST";
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
 diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
 +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-@@ -1008,7 +1008,7 @@ void CheckClientDownloadRequest::SendRequest() {
+@@ -1067,7 +1067,7 @@ void CheckClientDownloadRequest::SendRequest() {
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl();
    resource_request->method = "POST";
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/check_client_downl
 diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
 --- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
 +++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
-@@ -242,7 +242,7 @@ void PPAPIDownloadRequest::SendRequest() {
+@@ -250,7 +250,7 @@ void PPAPIDownloadRequest::SendRequest() {
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = GetDownloadRequestUrl();
    resource_request->method = "POST";
@@ -59,49 +59,10 @@ diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_req
    loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
                                               traffic_annotation);
    loader_->AttachStringForUpload(client_download_request_data_,
-diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
---- a/chrome/browser/safe_browsing/protocol_manager.cc
-+++ b/chrome/browser/safe_browsing/protocol_manager.cc
-@@ -282,7 +282,7 @@ void SafeBrowsingProtocolManager::GetFullHash(
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = gethash_url;
-   resource_request->method = "POST";
--  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
-   auto loader_ptr = network::SimpleURLLoader::Create(
-       std::move(resource_request), traffic_annotation);
-   loader_ptr->AttachStringForUpload(FormatGetHash(prefixes), "text/plain");
-@@ -688,7 +688,7 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest(
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = backup_update_url;
-   resource_request->method = "POST";
--  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
-   request_ = network::SimpleURLLoader::Create(std::move(resource_request),
-                                               traffic_annotation);
-   request_->AttachStringForUpload(update_list_data_, "text/plain");
-@@ -719,7 +719,7 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
- 
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = chunk_url;
--  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
-   request_ = network::SimpleURLLoader::Create(
-       std::move(resource_request), kChunkBackupRequestTrafficAnnotation);
-   request_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
-@@ -777,7 +777,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
-   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->url = update_url;
-   resource_request->method = "POST";
--  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
-+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
-   request_ = network::SimpleURLLoader::Create(
-       std::move(resource_request), kChunkBackupRequestTrafficAnnotation);
-   request_->AttachStringForUpload(update_list_data_, "text/plain");
 diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/components/safe_browsing/browser/threat_details_cache.cc
 --- a/components/safe_browsing/browser/threat_details_cache.cc
 +++ b/components/safe_browsing/browser/threat_details_cache.cc
-@@ -113,6 +113,7 @@ void ThreatDetailsCacheCollector::OpenEntry() {
+@@ -115,6 +115,7 @@ void ThreatDetailsCacheCollector::OpenEntry() {
    // Only from cache, and don't save cookies.
    resource_request->load_flags = net::LOAD_ONLY_FROM_CACHE |
                                   net::LOAD_SKIP_CACHE_VALIDATION |
@@ -109,6 +70,20 @@ diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/componen
                                   net::LOAD_DO_NOT_SAVE_COOKIES;
    current_load_ = network::SimpleURLLoader::Create(std::move(resource_request),
                                                     traffic_annotation);
+diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/components/safe_browsing/db/v4_update_protocol_manager.cc
+--- a/components/safe_browsing/db/v4_update_protocol_manager.cc
++++ b/components/safe_browsing/db/v4_update_protocol_manager.cc
+@@ -343,8 +343,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
+   std::string req_base64 = GetBase64SerializedUpdateRequestProto();
+   GetUpdateUrlAndHeaders(req_base64, &resource_request->url,
+                          &resource_request->headers);
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+-  std::unique_ptr<network::SimpleURLLoader> loader =
++  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
++ std::unique_ptr<network::SimpleURLLoader> loader =
+       network::SimpleURLLoader::Create(std::move(resource_request),
+                                        traffic_annotation);
+   loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
 -- 
-2.7.4
+2.11.0
 

build/patches/safe_browsing-disable-incident-reporting.patch

@@ -46,20 +46,20 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_
 diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
-@@ -58,8 +58,7 @@ class SafeBrowsingBlockingPageFactoryImpl
-     PrefService* prefs =
-         Profile::FromBrowserContext(web_contents->GetBrowserContext())
-             ->GetPrefs();
+@@ -61,8 +61,7 @@ class SafeBrowsingBlockingPageFactoryImpl
+     Profile* profile =
+         Profile::FromBrowserContext(web_contents->GetBrowserContext());
+     PrefService* prefs = profile->GetPrefs();
 -    bool is_extended_reporting_opt_in_allowed =
 -        IsExtendedReportingOptInAllowed(*prefs);
 +    bool is_extended_reporting_opt_in_allowed = false;
      bool is_proceed_anyway_disabled =
          prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
- 
+     unified_consent::UnifiedConsentService* consent_service =
 diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
 +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
-@@ -353,8 +353,10 @@ SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
+@@ -329,8 +329,10 @@ SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
  
  void SafeBrowsingService::RegisterAllDelayedAnalysis() {
  #if defined(FULL_SAFE_BROWSING)
@@ -69,7 +69,7 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/brow
 +#endif
  }
  
- SafeBrowsingProtocolConfig SafeBrowsingService::GetProtocolConfig() const {
+ V4ProtocolConfig SafeBrowsingService::GetV4ProtocolConfig() const {
 diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
 --- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
 +++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
@@ -82,5 +82,5 @@ diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.
  
  // Constants for the V4 phishing string upgrades.
 -- 
-2.7.4
+2.11.0
 

build/patches/safe_browsing-disable-reporting-of-safebrowsing-override.patch

@@ -12,7 +12,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
 diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc
 +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
-@@ -62,11 +62,13 @@ enum MalwareReportTypes {
+@@ -64,11 +64,13 @@ enum MalwareReportTypes {
    REPORT_RESULT_MAX
  };
  
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
  
  }  // namespace
  
-@@ -283,6 +285,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+@@ -289,6 +291,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
      return;
    }
  
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
    // Fill in metadata about which model we used.
    if (is_extended_reporting) {
      request->set_model_filename(model_loader_extended_->name());
-@@ -361,6 +367,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+@@ -371,6 +377,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
  
    // Record that we made a request
    phishing_report_times_.push(base::Time::Now());
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
  }
  
  void ClientSideDetectionService::StartClientReportMalwareRequest(
-@@ -375,6 +382,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -385,6 +392,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
      return;
    }
  
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
    std::string request_data;
    if (!request->SerializeToString(&request_data)) {
      UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION);
-@@ -444,6 +455,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -454,6 +465,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
  
    // Record that we made a malware request
    malware_report_times_.push(base::Time::Now());
@@ -65,5 +65,5 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
  
  void ClientSideDetectionService::HandlePhishingVerdict(
 -- 
-2.7.4
+2.11.0
 

build/patches/translate-disable-fetching-of-translate-languages-from-server.patch

@@ -18,7 +18,7 @@ diff --git a/components/translate/core/browser/translate_language_list.cc b/comp
    // If resource requests are not allowed, we'll get a callback when they are.
    if (!resource_requests_allowed_) {
      request_pending_ = true;
-@@ -233,6 +234,7 @@ void TranslateLanguageList::RequestLanguageList() {
+@@ -236,6 +237,7 @@ void TranslateLanguageList::RequestLanguageList() {
      if (!result)
        NotifyEvent(__LINE__, "Request is omitted due to retry limit");
    }
@@ -27,5 +27,5 @@ diff --git a/components/translate/core/browser/translate_language_list.cc b/comp
  
  void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {
 -- 
-2.7.4
+2.11.0
 

build/patches/ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch

@@ -0,0 +1,108 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 17 Sep 2018 21:57:19 +0200
+Subject: ungoogled-chromium: Always use local DevTools files instead of remote
+ files from Google
+
+NOTE: This can break Remote Debugging
+This also fixes local debugging with domain substitution
+Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c14
+---
+ third_party/blink/renderer/devtools/BUILD.gn                      | 6 ++----
+ third_party/blink/renderer/devtools/front_end/audits2_worker.json | 2 +-
+ third_party/blink/renderer/devtools/front_end/devtools_app.json   | 6 +++---
+ third_party/blink/renderer/devtools/front_end/shell.json          | 4 ++--
+ third_party/blink/renderer/devtools/front_end/worker_app.json     | 2 +-
+ 5 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/third_party/blink/renderer/devtools/BUILD.gn b/third_party/blink/renderer/devtools/BUILD.gn
+--- a/third_party/blink/renderer/devtools/BUILD.gn
++++ b/third_party/blink/renderer/devtools/BUILD.gn
+@@ -1162,10 +1162,8 @@ action("generate_devtools_grd") {
+       devtools_embedder_scripts +
+       [ "$resources_out_dir/devtools_extension_api.js" ]
+ 
+-  # Bundle remote modules in ChromeOS.
+-  if (is_chromeos) {
+-    grd_files += generated_remote_modules + devtools_emulated_devices_images
+-  }
++  # Always bundle remote modules.
++  grd_files += generated_remote_modules + devtools_emulated_devices_images
+ 
+   inputs = grd_files + devtools_image_files
+   outfile = "$root_gen_dir/devtools/devtools_resources.grd"
+diff --git a/third_party/blink/renderer/devtools/front_end/audits2_worker.json b/third_party/blink/renderer/devtools/front_end/audits2_worker.json
+--- a/third_party/blink/renderer/devtools/front_end/audits2_worker.json
++++ b/third_party/blink/renderer/devtools/front_end/audits2_worker.json
+@@ -1,6 +1,6 @@
+ {
+     "modules": [
+         { "name": "worker_service", "type": "autostart" },
+-        { "name": "audits2_worker", "type": "remote" }
++        { "name": "audits2_worker" }
+     ]
+ }
+diff --git a/third_party/blink/renderer/devtools/front_end/devtools_app.json b/third_party/blink/renderer/devtools/front_end/devtools_app.json
+--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
++++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
+@@ -4,7 +4,7 @@
+     { "name": "inspector_main", "type": "autostart" },
+     { "name": "mobile_throttling", "type": "autostart" },
+ 
+-    { "name": "accessibility", "type": "remote" },
++    { "name": "accessibility" },
+     { "name": "animation" },
+     { "name": "audits2" },
+     { "name": "browser_console" },
+@@ -12,14 +12,14 @@
+     { "name": "cookie_table" },
+     { "name": "devices" },
+     { "name": "elements" },
+-    { "name": "emulated_devices" , "type": "remote" },
++    { "name": "emulated_devices" },
+     { "name": "har_importer" },
+     { "name": "help" },
+     { "name": "layers" },
+     { "name": "layer_viewer" },
+     { "name": "network" },
+     { "name": "performance_monitor" },
+-    { "name": "product_registry_impl", "type": "remote" },
++    { "name": "product_registry_impl" },
+     { "name": "resources" },
+     { "name": "security" },
+     { "name": "timeline" },
+diff --git a/third_party/blink/renderer/devtools/front_end/shell.json b/third_party/blink/renderer/devtools/front_end/shell.json
+--- a/third_party/blink/renderer/devtools/front_end/shell.json
++++ b/third_party/blink/renderer/devtools/front_end/shell.json
+@@ -21,7 +21,7 @@
+ 
+     { "name": "changes" },
+     { "name": "cm" },
+-    { "name": "cm_modes", "type": "remote" },
++    { "name": "cm_modes" },
+     { "name": "color_picker" },
+     { "name": "console" },
+     { "name": "coverage" },
+@@ -41,7 +41,7 @@
+     { "name": "snippets" },
+     { "name": "source_frame" },
+     { "name": "sources" },
+-    { "name": "terminal", "type": "remote" },
++    { "name": "terminal" },
+     { "name": "text_editor" },
+     { "name": "workspace_diff" },
+     { "name": "protocol_monitor"}
+diff --git a/third_party/blink/renderer/devtools/front_end/worker_app.json b/third_party/blink/renderer/devtools/front_end/worker_app.json
+--- a/third_party/blink/renderer/devtools/front_end/worker_app.json
++++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
+@@ -11,7 +11,7 @@
+     { "name": "help" },
+     { "name": "layer_viewer" },
+     { "name": "network" },
+-    { "name": "product_registry_impl", "type": "remote" },
++    { "name": "product_registry_impl" },
+     { "name": "resources" },
+     { "name": "timeline" },
+     { "name": "timeline_model" }
+-- 
+2.11.0
+

build/patches/ungoogled-chromium-Disable-GCM.patch

@@ -10,23 +10,23 @@ Disable Google Cloud Messaging (GCM) client
 diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
 --- a/components/gcm_driver/gcm_client_impl.cc
 +++ b/components/gcm_driver/gcm_client_impl.cc
-@@ -502,6 +502,7 @@ void GCMClientImpl::StartGCM() {
+@@ -493,6 +493,7 @@ void GCMClientImpl::StartGCM() {
+   device_checkin_info_.Reset();
+   StartCheckin();
  }
++  return;
  
  void GCMClientImpl::InitializeMCSClient() {
-+  return;
-   std::vector<GURL> endpoints;
-   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
-   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
-@@ -699,6 +700,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+   DCHECK(network_connection_tracker_);
+@@ -685,6 +686,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
  }
  
  void GCMClientImpl::StartCheckin() {
 +  return;
    // Make sure no checkin is in progress.
-   if (checkin_request_.get())
+   if (checkin_request_)
      return;
-@@ -777,6 +779,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
+@@ -760,6 +762,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
  }
  
  void GCMClientImpl::SchedulePeriodicCheckin() {
@@ -35,5 +35,5 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
    if (checkin_request_.get() || !device_checkin_info_.accounts_set)
      return;
 -- 
-2.7.4
+2.11.0
 

build/patches/ungoogled-chromium-Disable-Gaia.patch

@@ -7,18 +7,18 @@ Somehow it is still being activated even without being signed-in.
 
 See also: https://github.com/Eloston/ungoogled-chromium/issues/104
 ---
- chrome/browser/browser_resources.grd               |  2 --
- .../component_extensions_whitelist/whitelist.cc    |  1 -
- .../signin/gaia_auth_extension_loader.cc           |  7 ------
- .../resources/component_extension_resources.grd    |  2 --
- chrome/browser/ui/webui/signin/inline_login_ui.cc  |  1 -
- google_apis/gaia/gaia_auth_fetcher.cc              | 29 ----------------------
- 6 files changed, 42 deletions(-)
+ chrome/browser/browser_resources.grd                                  | 2 --
+ chrome/browser/extensions/component_extensions_whitelist/whitelist.cc | 1 -
+ chrome/browser/extensions/signin/gaia_auth_extension_loader.cc        | 3 ++-
+ chrome/browser/resources/component_extension_resources.grd            | 2 --
+ chrome/browser/ui/webui/signin/inline_login_ui.cc                     | 1 -
+ google_apis/gaia/gaia_auth_fetcher.cc                                 | 4 +++-
+ 6 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -301,7 +301,6 @@
+@@ -348,7 +348,6 @@
        <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
        <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
        <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
@@ -26,8 +26,8 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
        <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
        <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
        <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
-@@ -436,7 +435,6 @@
-       </if>
+@@ -492,7 +491,6 @@
+       <include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
        <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
        <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
 -      <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" />
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
 diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
 --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
 +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
-@@ -68,7 +68,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
+@@ -67,7 +67,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
  #endif
      case IDR_CRYPTOTOKEN_MANIFEST:
      case IDR_FEEDBACK_MANIFEST:
@@ -48,30 +48,28 @@ diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.
 diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
 --- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
 +++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
-@@ -42,18 +42,11 @@ extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
+@@ -42,7 +42,7 @@ ComponentLoader* GetComponentLoader(BrowserContext* context) {
+ 
  void LoadGaiaAuthExtension(BrowserContext* context) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
- 
--  extensions::ComponentLoader* component_loader = GetComponentLoader(context);
+-
++/*
+   ComponentLoader* component_loader = GetComponentLoader(context);
    const base::CommandLine* command_line =
        base::CommandLine::ForCurrentProcess();
-   if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
--    base::FilePath auth_extension_path =
--        command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
--    component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
-     return;
-   }
--
--  component_loader->Add(IDR_GAIA_AUTH_MANIFEST,
--                        base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
+@@ -55,6 +55,7 @@ void LoadGaiaAuthExtension(BrowserContext* context) {
+ 
+   component_loader->Add(IDR_GAIA_AUTH_MANIFEST,
+                         base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
++*/
  }
  
  void UnloadGaiaAuthExtension(BrowserContext* context) {
 diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
 --- a/chrome/browser/resources/component_extension_resources.grd
 +++ b/chrome/browser/resources/component_extension_resources.grd
-@@ -40,8 +40,6 @@
-       <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
+@@ -32,8 +32,6 @@
+ 
        <!-- Material Design Bookmarks -->
        <include name="IDR_COMPONENT_MD_BOOKMARKS_BOOKMARKS_HTML" file="md_bookmarks/bookmarks.html" type="BINDATA" />
 -      <!-- Gaia auth extension -->
@@ -82,7 +80,7 @@ diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome
 diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
 +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
-@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
+@@ -49,7 +49,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
  
    source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
    source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
@@ -93,42 +91,31 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/
 diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
 --- a/google_apis/gaia/gaia_auth_fetcher.cc
 +++ b/google_apis/gaia/gaia_auth_fetcher.cc
-@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
-     int load_flags,
+@@ -44,7 +44,7 @@ namespace {
+ const int kLoadFlagsIgnoreCookies = net::LOAD_DO_NOT_SEND_COOKIES |
+                                     net::LOAD_DO_NOT_SAVE_COOKIES;
+ 
+-const size_t kMaxMessageSize = 1024 * 1024;  // 1MB
++//const size_t kMaxMessageSize = 1024 * 1024;  // 1MB
+ 
+ std::unique_ptr<const GaiaAuthConsumer::ClientOAuthResult>
+ ExtractOAuth2TokenPairResponse(const std::string& data) {
+@@ -240,6 +240,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
      const net::NetworkTrafficAnnotationTag& traffic_annotation) {
    DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
--  fetcher_ = net::URLFetcher::Create(
--      0, gaia_gurl, body.empty() ? net::URLFetcher::GET : net::URLFetcher::POST,
--      this, traffic_annotation);
--  fetcher_->SetRequestContext(getter_);
--  fetcher_->SetUploadData("application/x-www-form-urlencoded", body);
--  gaia::MarkURLFetcherAsGaia(fetcher_.get());
--
--  VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec();
--  VLOG(2) << "Gaia fetcher headers: " << headers;
--  VLOG(2) << "Gaia fetcher body: " << body;
--
--  // The Gaia token exchange requests do not require any cookie-based
--  // identification as part of requests.  We suppress sending any cookies to
--  // maintain a separation between the user's browsing and Chrome's internal
--  // services.  Where such mixing is desired (MergeSession or OAuthLogin), it
--  // will be done explicitly.
--  fetcher_->SetLoadFlags(load_flags);
--
--  // Fetchers are sometimes cancelled because a network change was detected,
--  // especially at startup and after sign-in on ChromeOS. Retrying once should
--  // be enough in those cases; let the fetcher retry up to 3 times just in case.
--  // http://crbug.com/163710
--  fetcher_->SetAutomaticallyRetryOnNetworkChanges(3);
--
--  if (!headers.empty())
--    fetcher_->SetExtraRequestHeaders(headers);
--
--  fetch_pending_ = true;
--  fetcher_->Start();
+ 
++/*
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = gaia_gurl;
+   original_url_ = gaia_gurl;
+@@ -294,6 +295,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+       base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
+                      base::Unretained(this)),
+       kMaxMessageSize);
++*/
  }
  
  // static
 -- 
-2.7.4
+2.11.0
 

build/patches/ungoogled-chromium-Disable-Google-host-detection.patch

@@ -6,10 +6,10 @@ Disables various detections of Google hosts and functionality specific to them
 ---
  .../page_load_metrics/page_load_metrics_util.cc    |   4 +-
  .../page_load_metrics/page_load_metrics_util.cc    |  33 +---
- components/google/core/browser/google_util.cc      | 193 ++-------------------
+ components/google/core/common/google_util.cc       | 194 ++-------------------
  components/search_engines/template_url.cc          |   6 +-
  net/base/url_util.cc                               |  22 ---
- 5 files changed, 14 insertions(+), 244 deletions(-)
+ 5 files changed, 14 insertions(+), 245 deletions(-)
 
 diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
 --- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
@@ -68,10 +68,10 @@ diff --git a/chrome/common/page_load_metrics/page_load_metrics_util.cc b/chrome/
  }
  
  bool IsGoogleHostname(const GURL& url) {
-diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc
---- a/components/google/core/browser/google_util.cc
-+++ b/components/google/core/browser/google_util.cc
-@@ -41,118 +41,16 @@ namespace {
+diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
+--- a/components/google/core/common/google_util.cc
++++ b/components/google/core/common/google_util.cc
+@@ -43,118 +43,16 @@ namespace {
  
  bool gUseMockLinkDoctorBaseURLForTesting = false;
  
@@ -148,9 +148,9 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 -  // same page.
 -  StripTrailingDot(&tld);
 -
--  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_tlds,
--                         ({GOOGLE_TLD_LIST}));
--  return base::ContainsKey(google_tlds, tld.as_string());
+-  static base::NoDestructor<std::set<std::string>> google_tlds(
+-      {GOOGLE_TLD_LIST});
+-  return base::ContainsKey(*google_tlds, tld.as_string());
 -}
 -
 -// True if |url| is a valid URL with a host that is in the static list of
@@ -163,10 +163,10 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 -  base::StringPiece host(url.host_piece());
 -  StripTrailingDot(&host);
 -
--  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_subdomains,
--                         ({"ipv4.google.com", "ipv6.google.com"}));
+-  static base::NoDestructor<std::set<std::string>> google_subdomains(
+-      {"ipv4.google.com", "ipv6.google.com"});
 -
--  return base::ContainsKey(google_subdomains, host.as_string());
+-  return base::ContainsKey(*google_subdomains, host.as_string());
 -}
 -
  }  // namespace
@@ -191,12 +191,12 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
  }
  
  void SetMockLinkDoctorBaseURLForTesting() {
-@@ -166,119 +64,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
+@@ -168,120 +66,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
  
  GURL AppendGoogleLocaleParam(const GURL& url,
                               const std::string& application_locale) {
--  return net::AppendQueryParameter(
--      url, "hl", GetGoogleLocale(application_locale));
+-  return net::AppendQueryParameter(url, "hl",
+-                                   GetGoogleLocale(application_locale));
 +  return url;
  }
  
@@ -205,7 +205,8 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 -  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
 -  // like "google.com./". https://crbug.com/720295.
 -  const size_t last_dot = google_hostname.find_last_of('.');
--  DCHECK_NE(std::string::npos, last_dot);
+-  if (last_dot == std::string::npos)
+-    return std::string();
 -  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
 -  // Assume the com TLD implies the US.
 -  if (country_code == "com")
@@ -236,19 +237,19 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 -  // Unit tests may add command-line flags after the first call to this
 -  // function, so we don't simply initialize a static |base_url| directly and
 -  // then unconditionally return it.
--  CR_DEFINE_STATIC_LOCAL(std::string, switch_value, ());
-   CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
+-  static base::NoDestructor<std::string> switch_value;
+   static base::NoDestructor<GURL> base_url;
 -  std::string current_switch_value(
 -      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
 -          switches::kGoogleBaseURL));
--  if (current_switch_value != switch_value) {
--    switch_value = current_switch_value;
--    base_url = url_formatter::FixupURL(switch_value, std::string());
--    if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
--      base_url = GURL();
+-  if (current_switch_value != *switch_value) {
+-    *switch_value = current_switch_value;
+-    *base_url = url_formatter::FixupURL(*switch_value, std::string());
+-    if (!base_url->is_valid() || base_url->has_query() || base_url->has_ref())
+-      *base_url = GURL();
 -  }
-+  base_url = GURL();
-   return base_url;
++  *base_url = GURL();
+   return *base_url;
  }
  
  bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
@@ -307,7 +308,7 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 -  // Check for query parameter in URL parameter and hash fragment, depending on
 -  // the path type.
 -  return HasGoogleSearchQueryParam(url.ref_piece()) ||
--      (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
+-         (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
 +  return false;
  }
  
@@ -315,8 +316,8 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
                          SubdomainPermission subdomain_permission,
                          PortPermission port_permission) {
 -  return IsValidURL(url, port_permission) &&
--      IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
--                      nullptr);
+-         IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
+-                         nullptr);
 +  return false;
  }
  
@@ -324,7 +325,7 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -510,11 +510,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
@@ -370,5 +371,5 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
  }
  
 -- 
-2.7.4
+2.11.0
 

build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 17 Sep 2018 21:50:15 +0200
+Subject: ungoogled-chromium: Disable Network Time Tracker
+
+This connects to Google to check if the system time is correct when a website certificate
+date seems incorrect, according to https://bugs.chromium.org/p/chromium/issues/detail?id=725232
+
+Fixes https://github.com/Eloston/ungoogled-chromium/issues/302
+---
+ components/network_time/network_time_tracker.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc
+--- a/components/network_time/network_time_tracker.cc
++++ b/components/network_time/network_time_tracker.cc
+@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time,
+ }
+ 
+ bool NetworkTimeTracker::AreTimeFetchesEnabled() const {
+-  return base::FeatureList::IsEnabled(kNetworkTimeServiceQuerying);
++  return false;
+ }
+ 
+ NetworkTimeTracker::FetchBehavior NetworkTimeTracker::GetFetchBehavior() const {
+-- 
+2.11.0
+