Release 68.0.3440.126

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,6 +14,7 @@ Arch: `arm` or `arm64` or `x86`
 
 **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.

CHANGELOG.md

@@ -1,6 +1,30 @@
+# 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)
+* fix for do not persist tabs preference saving
+* 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
-* updated AdBlock filters
 
 # 68.0.3440.72
 * fix crash during some canvas rendering (fixes https://github.com/bromite/bromite/issues/95)
@@ -12,11 +36,9 @@
 * 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)
-* updated AdBlock filters
 
 # 67.0.3396.107
 * removed patch to use Android Media Player for URLs (fixes https://github.com/bromite/bromite/issues/71)
-* updated AdBlock filters
 
 # 67.0.3396.101
 * set home page to new tab page
@@ -33,7 +55,6 @@
 * 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)
@@ -41,11 +62,9 @@
 * `CloudFlare` -> `Cloudflare` (fixes https://github.com/bromite/bromite/issues/73)
 * fingerprint mitigations: cover also `ConvertToArrayBufferContents`
 * removed redundant own patch for battery API
-* updated AdBlock filters
 
 # 67.0.3396.92
 * improve randomization for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
-* updated AdBlock filters
 
 # 67.0.3396.88
 * add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68)
@@ -56,90 +75,70 @@
 * 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 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)
@@ -156,20 +155,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)
@@ -182,23 +177,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" />
 
@@ -10,7 +10,7 @@ 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
 
@@ -69,10 +69,15 @@ No, it is not built-in.
 * baked-in adblock engine with filters from EasyList, EasyPrivacy and others
 * remove click-tracking and AMP from search results
 * DNS-over-HTTPS support via Google/CloudFlare servers
-* allow playing videos in background
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
+* chrome flags to hide NTP tiles, disable custom intents and clear session on exit
+* always-incognito mode
 * 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
 * all codecs included (proprietary, open H.264 etc.)
 * built with official speed optimizations
 
@@ -85,7 +90,9 @@ All built versions are available as [releases](https://github.com/bromite/bromit
 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.
+Additionally, [SystemWebView](https://www.bromite.org/system_web_view) and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+
+The official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).
 
 ## Integrity and authenticity
 

patches/BRM033_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch

@@ -152,7 +152,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -111339,6 +111339,7 @@ uploading your change for review.
+@@ -111352,6 +111352,7 @@ uploading your change for review.
    <suffix name="Overestimate"
        label="Tracks when the compositor's estimates were too high and by how
               much."/>

patches/BRM034_ungoogled-chromium-Disable-domain-reliability.patch

@@ -0,0 +1,676 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 25 Aug 2018 22:58:52 +0200
+Subject: ungoogled-chromium: Disable domain reliability
+
+---
+ components/domain_reliability/BUILD.gn           |  42 +-
+ components/domain_reliability/bake_in_configs.py |   2 +-
+ components/domain_reliability/google_configs.cc  | 565 -----------------------
+ components/domain_reliability/uploader.cc        |   2 +-
+ 4 files changed, 17 insertions(+), 594 deletions(-)
+
+diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn
+--- a/components/domain_reliability/BUILD.gn
++++ b/components/domain_reliability/BUILD.gn
+@@ -7,26 +7,6 @@ action("bake_in_configs") {
+   script = "bake_in_configs.py"
+ 
+   inputs = [
+-    "baked_in_configs/c_android_clients_google_com.json",
+-    "baked_in_configs/c_bigcache_googleapis_com.json",
+-    "baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json",
+-    "baked_in_configs/c_docs_google_com.json",
+-    "baked_in_configs/c_drive_google_com.json",
+-    "baked_in_configs/c_googlesyndication_com.json",
+-    "baked_in_configs/c_pack_google_com.json",
+-    "baked_in_configs/c_play_google_com.json",
+-    "baked_in_configs/c_youtube_com.json",
+-    "baked_in_configs/clients2_google_com.json",
+-    "baked_in_configs/docs_google_com.json",
+-    "baked_in_configs/gcp_gvt2_com.json",
+-    "baked_in_configs/gcp_gvt6_com.json",
+-    "baked_in_configs/google-analytics_com.json",
+-    "baked_in_configs/googlevideo_com.json",
+-    "baked_in_configs/gvt1_com.json",
+-    "baked_in_configs/gvt2_com.json",
+-    "baked_in_configs/gvt6_com.json",
+-    "baked_in_configs/ssl_gstatic_com.json",
+-    "baked_in_configs/www_google_com.json",
+   ]
+ 
+   output_file = "$target_gen_dir/baked_in_configs.cc"
+@@ -36,13 +16,21 @@ action("bake_in_configs") {
+ 
+   # The JSON file list is too long for the command line on Windows, so put
+   # them in a response file.
+-  response_file_contents = rebase_path(inputs, root_build_dir)
+-  args = [
+-    "--file-list",
+-    "{{response_file_name}}",
+-    "--output",
+-    rebase_path(output_file, root_build_dir),
+-  ]
++  if (is_win) {
++      args = [
++        "--file-list",
++        "nul",
++        "--output",
++        rebase_path(output_file, root_build_dir),
++      ]
++  } else {
++        args = [
++        "--file-list",
++        "/dev/null",
++        "--output",
++        rebase_path(output_file, root_build_dir),
++      ]
++  }
+ }
+ 
+ component("domain_reliability") {
+diff --git a/components/domain_reliability/bake_in_configs.py b/components/domain_reliability/bake_in_configs.py
+--- a/components/domain_reliability/bake_in_configs.py
++++ b/components/domain_reliability/bake_in_configs.py
+@@ -489,7 +489,7 @@ def origin_is_whitelisted(origin):
+     domain = origin[8:-1]
+   else:
+     return False
+-  return any(domain == e or domain.endswith('.' + e)  for e in DOMAIN_WHITELIST)
++  return False
+ 
+ 
+ def quote_and_wrap_text(text, width=79, prefix='  "', suffix='"'):
+diff --git a/components/domain_reliability/google_configs.cc b/components/domain_reliability/google_configs.cc
+--- a/components/domain_reliability/google_configs.cc
++++ b/components/domain_reliability/google_configs.cc
+@@ -13,575 +13,10 @@
+ 
+ namespace domain_reliability {
+ 
+-namespace {
+-
+-struct GoogleConfigParams {
+-  const char* hostname;
+-  bool include_subdomains;
+-
+-  // If true, prepend a collector URL within https://|hostname|/.
+-  bool include_origin_specific_collector;
+-
+-  // If true, also add a config for www.|hostname|.
+-  //
+-  // |include_subdomains| will be false in the extra config, but
+-  // |include_origin_specific_collector| will be respected, and will use the
+-  // www subdomain as the origin for the collector so it matches the config.
+-  bool duplicate_for_www;
+-};
+-
+-const GoogleConfigParams kGoogleConfigs[] = {
+-    // Origins with subdomains and same-origin collectors. Currently, all
+-    // origins with same-origin collectors also run collectors on their www
+-    // subdomain. (e.g., both foo.com and www.foo.com.)
+-    {"google.ac", true, true, true},
+-    {"google.ad", true, true, true},
+-    {"google.ae", true, true, true},
+-    {"google.af", true, true, true},
+-    {"google.ag", true, true, true},
+-    {"google.al", true, true, true},
+-    {"google.am", true, true, true},
+-    {"google.as", true, true, true},
+-    {"google.at", true, true, true},
+-    {"google.az", true, true, true},
+-    {"google.ba", true, true, true},
+-    {"google.be", true, true, true},
+-    {"google.bf", true, true, true},
+-    {"google.bg", true, true, true},
+-    {"google.bi", true, true, true},
+-    {"google.bj", true, true, true},
+-    {"google.bs", true, true, true},
+-    {"google.bt", true, true, true},
+-    {"google.by", true, true, true},
+-    {"google.ca", true, true, true},
+-    {"google.cc", true, true, true},
+-    {"google.cd", true, true, true},
+-    {"google.cf", true, true, true},
+-    {"google.cg", true, true, true},
+-    {"google.ch", true, true, true},
+-    {"google.ci", true, true, true},
+-    {"google.cl", true, true, true},
+-    {"google.cm", true, true, true},
+-    {"google.cn", true, true, true},
+-    {"google.co.ao", true, true, true},
+-    {"google.co.bw", true, true, true},
+-    {"google.co.ck", true, true, true},
+-    {"google.co.cr", true, true, true},
+-    {"google.co.hu", true, true, true},
+-    {"google.co.id", true, true, true},
+-    {"google.co.il", true, true, true},
+-    {"google.co.im", true, true, true},
+-    {"google.co.in", true, true, true},
+-    {"google.co.je", true, true, true},
+-    {"google.co.jp", true, true, true},
+-    {"google.co.ke", true, true, true},
+-    {"google.co.kr", true, true, true},
+-    {"google.co.ls", true, true, true},
+-    {"google.co.ma", true, true, true},
+-    {"google.co.mz", true, true, true},
+-    {"google.co.nz", true, true, true},
+-    {"google.co.th", true, true, true},
+-    {"google.co.tz", true, true, true},
+-    {"google.co.ug", true, true, true},
+-    {"google.co.uk", true, true, true},
+-    {"google.co.uz", true, true, true},
+-    {"google.co.ve", true, true, true},
+-    {"google.co.vi", true, true, true},
+-    {"google.co.za", true, true, true},
+-    {"google.co.zm", true, true, true},
+-    {"google.co.zw", true, true, true},
+-    {"google.com.af", true, true, true},
+-    {"google.com.ag", true, true, true},
+-    {"google.com.ai", true, true, true},
+-    {"google.com.ar", true, true, true},
+-    {"google.com.au", true, true, true},
+-    {"google.com.bd", true, true, true},
+-    {"google.com.bh", true, true, true},
+-    {"google.com.bn", true, true, true},
+-    {"google.com.bo", true, true, true},
+-    {"google.com.br", true, true, true},
+-    {"google.com.by", true, true, true},
+-    {"google.com.bz", true, true, true},
+-    {"google.com.cn", true, true, true},
+-    {"google.com.co", true, true, true},
+-    {"google.com.cu", true, true, true},
+-    {"google.com.cy", true, true, true},
+-    {"google.com.do", true, true, true},
+-    {"google.com.ec", true, true, true},
+-    {"google.com.eg", true, true, true},
+-    {"google.com.et", true, true, true},
+-    {"google.com.fj", true, true, true},
+-    {"google.com.ge", true, true, true},
+-    {"google.com.gh", true, true, true},
+-    {"google.com.gi", true, true, true},
+-    {"google.com.gr", true, true, true},
+-    {"google.com.gt", true, true, true},
+-    {"google.com.hk", true, true, true},
+-    {"google.com.iq", true, true, true},
+-    {"google.com.jm", true, true, true},
+-    {"google.com.jo", true, true, true},
+-    {"google.com.kh", true, true, true},
+-    {"google.com.kw", true, true, true},
+-    {"google.com.lb", true, true, true},
+-    {"google.com.ly", true, true, true},
+-    {"google.com.mm", true, true, true},
+-    {"google.com.mt", true, true, true},
+-    {"google.com.mx", true, true, true},
+-    {"google.com.my", true, true, true},
+-    {"google.com.na", true, true, true},
+-    {"google.com.nf", true, true, true},
+-    {"google.com.ng", true, true, true},
+-    {"google.com.ni", true, true, true},
+-    {"google.com.np", true, true, true},
+-    {"google.com.nr", true, true, true},
+-    {"google.com.om", true, true, true},
+-    {"google.com.pa", true, true, true},
+-    {"google.com.pe", true, true, true},
+-    {"google.com.pg", true, true, true},
+-    {"google.com.ph", true, true, true},
+-    {"google.com.pk", true, true, true},
+-    {"google.com.pl", true, true, true},
+-    {"google.com.pr", true, true, true},
+-    {"google.com.py", true, true, true},
+-    {"google.com.qa", true, true, true},
+-    {"google.com.ru", true, true, true},
+-    {"google.com.sa", true, true, true},
+-    {"google.com.sb", true, true, true},
+-    {"google.com.sg", true, true, true},
+-    {"google.com.sl", true, true, true},
+-    {"google.com.sv", true, true, true},
+-    {"google.com.tj", true, true, true},
+-    {"google.com.tn", true, true, true},
+-    {"google.com.tr", true, true, true},
+-    {"google.com.tw", true, true, true},
+-    {"google.com.ua", true, true, true},
+-    {"google.com.uy", true, true, true},
+-    {"google.com.vc", true, true, true},
+-    {"google.com.ve", true, true, true},
+-    {"google.com.vn", true, true, true},
+-    {"google.cv", true, true, true},
+-    {"google.cz", true, true, true},
+-    {"google.de", true, true, true},
+-    {"google.dj", true, true, true},
+-    {"google.dk", true, true, true},
+-    {"google.dm", true, true, true},
+-    {"google.dz", true, true, true},
+-    {"google.ee", true, true, true},
+-    {"google.es", true, true, true},
+-    {"google.fi", true, true, true},
+-    {"google.fm", true, true, true},
+-    {"google.fr", true, true, true},
+-    {"google.ga", true, true, true},
+-    {"google.ge", true, true, true},
+-    {"google.gg", true, true, true},
+-    {"google.gl", true, true, true},
+-    {"google.gm", true, true, true},
+-    {"google.gp", true, true, true},
+-    {"google.gr", true, true, true},
+-    {"google.gy", true, true, true},
+-    {"google.hk", true, true, true},
+-    {"google.hn", true, true, true},
+-    {"google.hr", true, true, true},
+-    {"google.ht", true, true, true},
+-    {"google.hu", true, true, true},
+-    {"google.ie", true, true, true},
+-    {"google.im", true, true, true},
+-    {"google.iq", true, true, true},
+-    {"google.ir", true, true, true},
+-    {"google.is", true, true, true},
+-    {"google.it", true, true, true},
+-    {"google.it.ao", true, true, true},
+-    {"google.je", true, true, true},
+-    {"google.jo", true, true, true},
+-    {"google.jp", true, true, true},
+-    {"google.kg", true, true, true},
+-    {"google.ki", true, true, true},
+-    {"google.kz", true, true, true},
+-    {"google.la", true, true, true},
+-    {"google.li", true, true, true},
+-    {"google.lk", true, true, true},
+-    {"google.lt", true, true, true},
+-    {"google.lu", true, true, true},
+-    {"google.lv", true, true, true},
+-    {"google.md", true, true, true},
+-    {"google.me", true, true, true},
+-    {"google.mg", true, true, true},
+-    {"google.mk", true, true, true},
+-    {"google.ml", true, true, true},
+-    {"google.mn", true, true, true},
+-    {"google.ms", true, true, true},
+-    {"google.mu", true, true, true},
+-    {"google.mv", true, true, true},
+-    {"google.mw", true, true, true},
+-    {"google.ne", true, true, true},
+-    {"google.ne.jp", true, true, true},
+-    {"google.ng", true, true, true},
+-    {"google.nl", true, true, true},
+-    {"google.no", true, true, true},
+-    {"google.nr", true, true, true},
+-    {"google.nu", true, true, true},
+-    {"google.off.ai", true, true, true},
+-    {"google.pk", true, true, true},
+-    {"google.pl", true, true, true},
+-    {"google.pn", true, true, true},
+-    {"google.ps", true, true, true},
+-    {"google.pt", true, true, true},
+-    {"google.ro", true, true, true},
+-    {"google.rs", true, true, true},
+-    {"google.ru", true, true, true},
+-    {"google.rw", true, true, true},
+-    {"google.sc", true, true, true},
+-    {"google.se", true, true, true},
+-    {"google.sh", true, true, true},
+-    {"google.si", true, true, true},
+-    {"google.sk", true, true, true},
+-    {"google.sm", true, true, true},
+-    {"google.sn", true, true, true},
+-    {"google.so", true, true, true},
+-    {"google.sr", true, true, true},
+-    {"google.st", true, true, true},
+-    {"google.td", true, true, true},
+-    {"google.tg", true, true, true},
+-    {"google.tk", true, true, true},
+-    {"google.tl", true, true, true},
+-    {"google.tm", true, true, true},
+-    {"google.tn", true, true, true},
+-    {"google.to", true, true, true},
+-    {"google.tt", true, true, true},
+-    {"google.us", true, true, true},
+-    {"google.uz", true, true, true},
+-    {"google.vg", true, true, true},
+-    {"google.vu", true, true, true},
+-    {"google.ws", true, true, true},
+-    {"l.google.com", true, true, true},
+-
+-    // google.com is a special case. We have a custom config for www.google.com,
+-    // so set generate_config_for_www_subdomain = false.
+-    {"google.com", true, true, false},
+-
+-    // Origins with subdomains and without same-origin collectors.
+-    {"2mdn.net", true, false, false},
+-    {"adgoogle.net", true, false, false},
+-    {"admeld.com", true, false, false},
+-    {"admob.biz", true, false, false},
+-    {"admob.co.in", true, false, false},
+-    {"admob.co.kr", true, false, false},
+-    {"admob.co.nz", true, false, false},
+-    {"admob.co.uk", true, false, false},
+-    {"admob.co.za", true, false, false},
+-    {"admob.com", true, false, false},
+-    {"admob.com.br", true, false, false},
+-    {"admob.com.es", true, false, false},
+-    {"admob.com.fr", true, false, false},
+-    {"admob.com.mx", true, false, false},
+-    {"admob.com.pt", true, false, false},
+-    {"admob.de", true, false, false},
+-    {"admob.dk", true, false, false},
+-    {"admob.es", true, false, false},
+-    {"admob.fi", true, false, false},
+-    {"admob.fr", true, false, false},
+-    {"admob.gr", true, false, false},
+-    {"admob.hk", true, false, false},
+-    {"admob.ie", true, false, false},
+-    {"admob.in", true, false, false},
+-    {"admob.it", true, false, false},
+-    {"admob.jp", true, false, false},
+-    {"admob.kr", true, false, false},
+-    {"admob.mobi", true, false, false},
+-    {"admob.no", true, false, false},
+-    {"admob.ph", true, false, false},
+-    {"admob.pt", true, false, false},
+-    {"admob.sg", true, false, false},
+-    {"admob.tw", true, false, false},
+-    {"admob.us", true, false, false},
+-    {"admob.vn", true, false, false},
+-    {"adwhirl.com", true, false, false},
+-    {"ampproject.com", true, false, false},
+-    {"ampproject.net", true, false, false},
+-    {"ampproject.org", true, false, false},
+-    {"android.com", true, false, false},
+-    {"anycast-edge.metric.gstatic.com", true, false, false},
+-    {"anycast-stb.metric.gstatic.com", true, false, false},
+-    {"anycast.metric.gstatic.com", true, false, false},
+-    {"cdn.ampproject.org", true, false, false},
+-    {"chromecast.com", true, false, false},
+-    {"chromeexperiments.com", true, false, false},
+-    {"chromestatus.com", true, false, false},
+-    {"chromium.org", true, false, false},
+-    {"clients6.google.com", true, false, false},
+-    {"cloudendpointsapis.com", true, false, false},
+-    {"dartmotif.com", true, false, false},
+-    {"dartsearch.net", true, false, false},
+-    {"doubleclick.com", true, false, false},
+-    {"doubleclick.ne.jp", true, false, false},
+-    {"doubleclick.net", true, false, false},
+-    {"doubleclickusercontent.com", true, false, false},
+-    {"fls.doubleclick.net", true, false, false},
+-    {"g.co", true, false, false},
+-    {"g.doubleclick.net", true, false, false},
+-    {"ggpht.com", true, false, false},
+-    {"gmodules.com", true, false, false},
+-    {"goo.gl", true, false, false},
+-    {"google-syndication.com", true, false, false},
+-    {"google.cat", true, false, false},
+-    {"google.info", true, false, false},
+-    {"google.jobs", true, false, false},
+-    {"google.net", true, false, false},
+-    {"google.org", true, false, false},
+-    {"google.stackdriver.com", true, false, false},
+-    {"googleadapis.com", true, false, false},
+-    {"googleadservices.com", true, false, false},
+-    {"googleadsserving.cn", true, false, false},
+-    {"googlealumni.com", true, false, false},
+-    {"googleapis.cn", true, false, false},
+-    {"googleapis.com", true, false, false},
+-    {"googleapps.com", true, false, false},
+-    {"googlecbs.com", true, false, false},
+-    {"googlecode.com", true, false, false},
+-    {"googlecommerce.com", true, false, false},
+-    {"googledrive.com", true, false, false},
+-    {"googleenterprise.com", true, false, false},
+-    {"googlefiber.com", true, false, false},
+-    {"googlefiber.net", true, false, false},
+-    {"googlegoro.com", true, false, false},
+-    {"googlehosted.com", true, false, false},
+-    {"googlepayments.com", true, false, false},
+-    {"googlesource.com", true, false, false},
+-    {"googlesyndication.com", true, false, false},
+-    {"googletagmanager.com", true, false, false},
+-    {"googletagservices.com", true, false, false},
+-    {"googleusercontent.com", true, false, false},
+-    {"googlezip.net", true, false, false},
+-    {"gstatic.cn", true, false, false},
+-    {"gstatic.com", true, false, false},
+-    {"gvt3.com", true, false, false},
+-    {"gvt9.com", true, false, false},
+-    {"picasa.com", true, false, false},
+-    {"recaptcha.net", true, false, false},
+-    {"stackdriver.com", true, false, false},
+-    {"stbcast-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast.metric.gstatic.com", true, false, false},
+-    {"stbcast2-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast2.metric.gstatic.com", true, false, false},
+-    {"stbcast3-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast3.metric.gstatic.com", true, false, false},
+-    {"stbcast4-stb.metric.gstatic.com", true, false, false},
+-    {"stbcast4.metric.gstatic.com", true, false, false},
+-    {"unicast-edge.metric.gstatic.com", true, false, false},
+-    {"unicast-stb.metric.gstatic.com", true, false, false},
+-    {"unicast.metric.gstatic.com", true, false, false},
+-    {"unicast2-stb.metric.gstatic.com", true, false, false},
+-    {"unicast2.metric.gstatic.com", true, false, false},
+-    {"waze.com", true, false, false},
+-    {"withgoogle.com", true, false, false},
+-    {"youtu.be", true, false, false},
+-    {"youtube-3rd-party.com", true, false, false},
+-    {"youtube-nocookie.com", true, false, false},
+-    {"youtube.ae", true, false, false},
+-    {"youtube.al", true, false, false},
+-    {"youtube.am", true, false, false},
+-    {"youtube.at", true, false, false},
+-    {"youtube.az", true, false, false},
+-    {"youtube.ba", true, false, false},
+-    {"youtube.be", true, false, false},
+-    {"youtube.bg", true, false, false},
+-    {"youtube.bh", true, false, false},
+-    {"youtube.bo", true, false, false},
+-    {"youtube.ca", true, false, false},
+-    {"youtube.cat", true, false, false},
+-    {"youtube.ch", true, false, false},
+-    {"youtube.cl", true, false, false},
+-    {"youtube.co", true, false, false},
+-    {"youtube.co.ae", true, false, false},
+-    {"youtube.co.at", true, false, false},
+-    {"youtube.co.hu", true, false, false},
+-    {"youtube.co.id", true, false, false},
+-    {"youtube.co.il", true, false, false},
+-    {"youtube.co.in", true, false, false},
+-    {"youtube.co.jp", true, false, false},
+-    {"youtube.co.ke", true, false, false},
+-    {"youtube.co.kr", true, false, false},
+-    {"youtube.co.ma", true, false, false},
+-    {"youtube.co.nz", true, false, false},
+-    {"youtube.co.th", true, false, false},
+-    {"youtube.co.ug", true, false, false},
+-    {"youtube.co.uk", true, false, false},
+-    {"youtube.co.ve", true, false, false},
+-    {"youtube.co.za", true, false, false},
+-    {"youtube.com", true, false, false},
+-    {"youtube.com.ar", true, false, false},
+-    {"youtube.com.au", true, false, false},
+-    {"youtube.com.az", true, false, false},
+-    {"youtube.com.bh", true, false, false},
+-    {"youtube.com.bo", true, false, false},
+-    {"youtube.com.br", true, false, false},
+-    {"youtube.com.by", true, false, false},
+-    {"youtube.com.co", true, false, false},
+-    {"youtube.com.do", true, false, false},
+-    {"youtube.com.ee", true, false, false},
+-    {"youtube.com.eg", true, false, false},
+-    {"youtube.com.es", true, false, false},
+-    {"youtube.com.gh", true, false, false},
+-    {"youtube.com.gr", true, false, false},
+-    {"youtube.com.gt", true, false, false},
+-    {"youtube.com.hk", true, false, false},
+-    {"youtube.com.hr", true, false, false},
+-    {"youtube.com.jm", true, false, false},
+-    {"youtube.com.jo", true, false, false},
+-    {"youtube.com.kw", true, false, false},
+-    {"youtube.com.lb", true, false, false},
+-    {"youtube.com.lv", true, false, false},
+-    {"youtube.com.mk", true, false, false},
+-    {"youtube.com.mt", true, false, false},
+-    {"youtube.com.mx", true, false, false},
+-    {"youtube.com.my", true, false, false},
+-    {"youtube.com.ng", true, false, false},
+-    {"youtube.com.om", true, false, false},
+-    {"youtube.com.pe", true, false, false},
+-    {"youtube.com.ph", true, false, false},
+-    {"youtube.com.pk", true, false, false},
+-    {"youtube.com.pt", true, false, false},
+-    {"youtube.com.qa", true, false, false},
+-    {"youtube.com.ro", true, false, false},
+-    {"youtube.com.sa", true, false, false},
+-    {"youtube.com.sg", true, false, false},
+-    {"youtube.com.tn", true, false, false},
+-    {"youtube.com.tr", true, false, false},
+-    {"youtube.com.tw", true, false, false},
+-    {"youtube.com.ua", true, false, false},
+-    {"youtube.com.uy", true, false, false},
+-    {"youtube.com.ve", true, false, false},
+-    {"youtube.cz", true, false, false},
+-    {"youtube.de", true, false, false},
+-    {"youtube.dk", true, false, false},
+-    {"youtube.ee", true, false, false},
+-    {"youtube.es", true, false, false},
+-    {"youtube.fi", true, false, false},
+-    {"youtube.fr", true, false, false},
+-    {"youtube.ge", true, false, false},
+-    {"youtube.gr", true, false, false},
+-    {"youtube.gt", true, false, false},
+-    {"youtube.hk", true, false, false},
+-    {"youtube.hr", true, false, false},
+-    {"youtube.hu", true, false, false},
+-    {"youtube.ie", true, false, false},
+-    {"youtube.in", true, false, false},
+-    {"youtube.is", true, false, false},
+-    {"youtube.it", true, false, false},
+-    {"youtube.jo", true, false, false},
+-    {"youtube.jp", true, false, false},
+-    {"youtube.kr", true, false, false},
+-    {"youtube.lk", true, false, false},
+-    {"youtube.lt", true, false, false},
+-    {"youtube.lv", true, false, false},
+-    {"youtube.ma", true, false, false},
+-    {"youtube.md", true, false, false},
+-    {"youtube.me", true, false, false},
+-    {"youtube.mk", true, false, false},
+-    {"youtube.mx", true, false, false},
+-    {"youtube.my", true, false, false},
+-    {"youtube.ng", true, false, false},
+-    {"youtube.nl", true, false, false},
+-    {"youtube.no", true, false, false},
+-    {"youtube.pe", true, false, false},
+-    {"youtube.ph", true, false, false},
+-    {"youtube.pk", true, false, false},
+-    {"youtube.pl", true, false, false},
+-    {"youtube.pr", true, false, false},
+-    {"youtube.pt", true, false, false},
+-    {"youtube.qa", true, false, false},
+-    {"youtube.ro", true, false, false},
+-    {"youtube.rs", true, false, false},
+-    {"youtube.ru", true, false, false},
+-    {"youtube.sa", true, false, false},
+-    {"youtube.se", true, false, false},
+-    {"youtube.sg", true, false, false},
+-    {"youtube.si", true, false, false},
+-    {"youtube.sk", true, false, false},
+-    {"youtube.sn", true, false, false},
+-    {"youtube.tn", true, false, false},
+-    {"youtube.ua", true, false, false},
+-    {"youtube.ug", true, false, false},
+-    {"youtube.uy", true, false, false},
+-    {"youtube.vn", true, false, false},
+-    {"youtubeeducation.com", true, false, false},
+-    {"youtubemobilesupport.com", true, false, false},
+-    {"ytimg.com", true, false, false},
+-
+-    // Origins without subdomains and with same-origin collectors.
+-    {"accounts.google.com", false, true, false},
+-    {"apis.google.com", false, true, false},
+-    {"app.google.stackdriver.com", false, true, false},
+-    {"b.mail.google.com", false, true, false},
+-    {"chatenabled.mail.google.com", false, true, false},
+-    {"ddm.google.com", false, true, false},
+-    {"gmail.com", false, true, false},
+-    {"gmail.google.com", false, true, false},
+-    {"mail-attachment.googleusercontent.com", false, true, false},
+-    {"mail.google.com", false, true, false},
+-    {"www.gmail.com", false, true, false},
+-
+-    // Origins without subdomains or same-origin collectors.
+-    {"ad.doubleclick.net", false, false, false},
+-    {"drive.google.com", false, false, false},
+-    {"redirector.googlevideo.com", false, false, false},
+-};
+-
+-const char* const kGoogleStandardCollectors[] = {
+-    "https://beacons.gcp.gvt2.com/domainreliability/upload",
+-    "https://beacons.gvt2.com/domainreliability/upload",
+-    "https://beacons2.gvt2.com/domainreliability/upload",
+-    "https://beacons3.gvt2.com/domainreliability/upload",
+-    "https://beacons4.gvt2.com/domainreliability/upload",
+-    "https://beacons5.gvt2.com/domainreliability/upload",
+-    "https://beacons5.gvt3.com/domainreliability/upload",
+-    "https://clients2.google.com/domainreliability/upload",
+-};
+-
+-const char* const kGoogleOriginSpecificCollectorPathString =
+-    "/domainreliability/upload";
+-
+-static std::unique_ptr<DomainReliabilityConfig> CreateGoogleConfig(
+-    const GoogleConfigParams& params,
+-    bool is_www) {
+-  if (is_www)
+-    DCHECK(params.duplicate_for_www);
+-
+-  std::string hostname = (is_www ? "www." : "") + std::string(params.hostname);
+-  bool include_subdomains = params.include_subdomains && !is_www;
+-
+-  std::unique_ptr<DomainReliabilityConfig> config(
+-      new DomainReliabilityConfig());
+-  config->origin = GURL("https://" + hostname + "/");
+-  config->include_subdomains = include_subdomains;
+-  config->collectors.clear();
+-  if (params.include_origin_specific_collector) {
+-    GURL::Replacements replacements;
+-    replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString);
+-    config->collectors.push_back(
+-        std::make_unique<GURL>(config->origin.ReplaceComponents(replacements)));
+-  }
+-  for (size_t i = 0; i < arraysize(kGoogleStandardCollectors); i++)
+-    config->collectors.push_back(
+-        std::make_unique<GURL>(kGoogleStandardCollectors[i]));
+-  config->success_sample_rate = 0.05;
+-  config->failure_sample_rate = 1.00;
+-  config->path_prefixes.clear();
+-  return config;
+-}
+-
+-}  // namespace
+-
+ // static
+ void GetAllGoogleConfigs(
+     std::vector<std::unique_ptr<DomainReliabilityConfig>>* configs_out) {
+   configs_out->clear();
+-
+-  for (auto& params : kGoogleConfigs) {
+-    configs_out->push_back(CreateGoogleConfig(params, false));
+-    if (params.duplicate_for_www)
+-      configs_out->push_back(CreateGoogleConfig(params, true));
+-  }
+ }
+ 
+ }  // namespace domain_reliability
+diff --git a/components/domain_reliability/uploader.cc b/components/domain_reliability/uploader.cc
+--- a/components/domain_reliability/uploader.cc
++++ b/components/domain_reliability/uploader.cc
+@@ -82,7 +82,7 @@ class DomainReliabilityUploaderImpl
+     if (discard_uploads_)
+       discarded_upload_count_++;
+ 
+-    if (discard_uploads_ || shutdown_) {
++    if (true) {
+       VLOG(1) << "Discarding report instead of uploading.";
+       UploadResult result;
+       result.status = UploadResult::SUCCESS;
+-- 
+2.7.4
+

patches/BRM041_Cure-AMP-and-tracking-from-search-results.patch

@@ -1,61 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 28 Oct 2017 10:09:41 +0200
-Subject: Cure AMP and tracking from search results
-
----
- third_party/blink/renderer/core/dom/BUILD.gn    |  1 +
- third_party/blink/renderer/core/dom/document.cc | 20 +++++++++++++++++++-
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
---- a/third_party/blink/renderer/core/dom/BUILD.gn
-+++ b/third_party/blink/renderer/core/dom/BUILD.gn
-@@ -147,6 +147,7 @@ blink_core_sources("dom") {
-     "events/tree_scope_event_context.h",
-     "events/window_event_context.cc",
-     "events/window_event_context.h",
-+    "extensions/dont-track-me.h",
-     "exception_code.h",
-     "first_letter_pseudo_element.cc",
-     "first_letter_pseudo_element.h",
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -277,6 +277,8 @@
- #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
- #include "third_party/blink/renderer/platform/wtf/time.h"
- 
-+#include "extensions/anti_amp_cure.h"
-+
- #ifndef NDEBUG
- using WeakDocumentSet =
-     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
-@@ -5882,8 +5884,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
--  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  const SecurityOrigin *origin = GetSecurityOrigin();
-+  if (origin) {
-+    WTF::String domain = origin->Domain();
-+    size_t pos = domain.Find(".google.");
-+    auto* bodyElement = body();
-+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-+      e->setText(ANTI_AMP_CURE_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  }
- 
-   FirstMeaningfulPaintDetector::From(*this).CheckNetworkStable();
- }
--- 
-2.7.4
-

patches/BRM042_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch

@@ -0,0 +1,106 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Oct 2017 10:09:41 +0200
+Subject: Inject scripts for AMP, tracking, ads and video functionality
+
+Remove AMP, tracking and ads from search results
+Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com to
+allow playing videos in background (original Javascript code by timdream)
+---
+ third_party/blink/renderer/core/dom/BUILD.gn       |  2 ++
+ third_party/blink/renderer/core/dom/document.cc    | 28 +++++++++++++++++++++-
+ .../renderer/core/dom/extensions/anti_amp_cure.h   |  6 +++++
+ .../renderer/core/dom/extensions/video_bg_play.h   |  6 +++++
+ 4 files changed, 41 insertions(+), 1 deletion(-)
+ create mode 100644 third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
+ create mode 100644 third_party/blink/renderer/core/dom/extensions/video_bg_play.h
+
+diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
+--- a/third_party/blink/renderer/core/dom/BUILD.gn
++++ b/third_party/blink/renderer/core/dom/BUILD.gn
+@@ -147,6 +147,8 @@ blink_core_sources("dom") {
+     "events/tree_scope_event_context.h",
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
++    "extensions/dont-track-me.h",
++    "extensions/video-bg-play.h",
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
++++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -222,6 +222,7 @@
+ #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
+ #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
+ #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
++#include "extensions/video_bg_play.h"
+ #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
+ #include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h"
+ #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
+@@ -277,6 +278,8 @@
+ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
+ #include "third_party/blink/renderer/platform/wtf/time.h"
+ 
++#include "extensions/anti_amp_cure.h"
++
+ #ifndef NDEBUG
+ using WeakDocumentSet =
+     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
+@@ -5882,8 +5885,31 @@ void Document::FinishedParsing() {
+     fetcher_->ClearResourcesFromPreviousFetcher();
+   }
+ 
+-  if (IsPrefetchOnly())
++  if (IsPrefetchOnly()) {
+     WebPrerenderingSupport::Current()->PrefetchFinished();
++    return;
++  }
++
++  // determine whether this is a Google search results page
++  const WTF::String& host = url_.Host();
++  auto* bodyElement = body();
++  if (bodyElement) {
++    size_t pos = host.Find(".google.");
++    if ((pos != WTF::kNotFound) && (host.length() - pos - 8 < 4)) {
++      LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
++      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
++      e->setText(ANTI_AMP_CURE_JS);
++      bodyElement->AppendChild(e);
++    }
++
++    // check for eligibility of the video bg fix
++    if ((WTF::kNotFound != host.Find("youtube.com")) || (WTF::kNotFound != host.Find("vimeo.com"))) {
++      LOG(INFO) << "injecting video-bg-play Javascript payload";
++      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
++      e->setText(VIDEO_BG_PLAY_JS);
++      bodyElement->AppendChild(e);
++    }
++  } // has origin and body element
+ 
+   FirstMeaningfulPaintDetector::From(*this).CheckNetworkStable();
+ }
+diff --git a/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
+new file mode 100644
+--- /dev/null
++++ b/third_party/blink/renderer/core/dom/extensions/anti_amp_cure.h
+@@ -0,0 +1,6 @@
++#ifndef anti_amp_cure_h
++#define anti_amp_cure_h
++
++#define ANTI_AMP_CURE_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks(document));\n}\n\nfunction hookMoreResults() {\n      var extrares = document.getElementById('extrares');\n      if (!extrares) {\n         console.log(\"could not hook more results\");\n         return;\n      }\n      // mutation observers are great but they don't work\n      extrares.addEventListener(\"DOMNodeInserted\", function(e) {\n         var node = e.target;\n         if (node.id && node.id.startsWith(\"arc-srp\"))\n             console.log(\"hyperlinks sanitized on new result node: \", sanitizeAllHyperlinks(node));\n      });\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('qslc');\n      if (mlogo && mlogo.children[0]) {\n        mlogo = mlogo.children[0];\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks(rootNode) {\n    var saned = 0, total = 0;\n    rootNode.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n    sanitizeAll();\n}\nsetMlogoClick();\n\nhookMoreResults();\n"
++
++#endif  // anti_amp_cure_h
+diff --git a/third_party/blink/renderer/core/dom/extensions/video_bg_play.h b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
+new file mode 100644
+--- /dev/null
++++ b/third_party/blink/renderer/core/dom/extensions/video_bg_play.h
+@@ -0,0 +1,6 @@
++#ifndef video_bg_play_h
++#define video_bg_play_h
++
++#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
++
++#endif  // video_bg_play_h
+-- 
+2.7.4
+

patches/BRM042_Play-videos-in-background.patch

@@ -1,66 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 18 Feb 2018 22:15:25 +0100
-Subject: Play videos in background
-
-Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
-Original Javascript code by timdream
----
- third_party/blink/renderer/core/dom/BUILD.gn    |  1 +
- third_party/blink/renderer/core/dom/document.cc | 17 +++++++++++++----
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
---- a/third_party/blink/renderer/core/dom/BUILD.gn
-+++ b/third_party/blink/renderer/core/dom/BUILD.gn
-@@ -148,6 +148,7 @@ blink_core_sources("dom") {
-     "events/window_event_context.cc",
-     "events/window_event_context.h",
-     "extensions/dont-track-me.h",
-+    "extensions/video-bg-play.h",
-     "exception_code.h",
-     "first_letter_pseudo_element.cc",
-     "first_letter_pseudo_element.h",
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -222,6 +222,7 @@
- #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
- #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
- #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
-+#include "extensions/video_bg_play.h"
- #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
- #include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h"
- #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
-@@ -5891,17 +5892,25 @@ void Document::FinishedParsing() {
- 
-   // determine whether this is a Google search results page
-   const SecurityOrigin *origin = GetSecurityOrigin();
--  if (origin) {
-+  auto* bodyElement = body();
-+  if (origin && bodyElement) {
-     WTF::String domain = origin->Domain();
-     size_t pos = domain.Find(".google.");
--    auto* bodyElement = body();
--    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+    if ((pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-       LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
-       HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-       e->setText(ANTI_AMP_CURE_JS);
-       bodyElement->AppendChild(e);
-     }
--  }
-+
-+    // check for eligibility of the video bg fix
-+    if ((WTF::kNotFound != domain.Find("youtube.com")) || (WTF::kNotFound != domain.Find("vimeo.com"))) {
-+      LOG(INFO) << "injecting video-bg-play Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-+      e->setText(VIDEO_BG_PLAY_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  } // has origin and body element
- 
-   FirstMeaningfulPaintDetector::From(*this).CheckNetworkStable();
- }
--- 
-2.7.4
-

patches/BRM045_Add-exit-menu-item.patch

@@ -2,11 +2,13 @@ From: Serg <serg.zhukovsky@gmail.com>
 Date: Tue, 31 Jan 2017 22:12:27 -0500
 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
@@ -32,6 +34,22 @@ 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

patches/BRM048_Bromite-adblock-engine.patch

@@ -1,17 +1,15 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 28 Mar 2018 15:55:11 +0200
+Date: Thu, 23 Aug 2018 19:30:15 +0200
 Subject: Bromite adblock engine
 
-Ported from NoChromo patch
+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 +
@@ -20,18 +18,14 @@ Perform adblock interception in StartJob to address lagging issues
  .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
  .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
  .../java/strings/android_chrome_strings.grd        |  11 +
+ chrome/browser/net/chrome_network_delegate.cc      |  55 ++++
  .../subresource_filter_content_settings_manager.cc |   3 +
- net/BUILD.gn                                       |   9 +-
- net/url_request/adblock_intercept.cc               | 329 +++++++++++++++++++++
- net/url_request/adblock_intercept.h                |  18 ++
- net/url_request/nochromo_intercept.cc              | 116 --------
- net/url_request/nochromo_intercept.h               |  13 -
- net/url_request/url_request.cc                     |  36 ++-
- 14 files changed, 480 insertions(+), 134 deletions(-)
+ net/BUILD.gn                                       |   7 +
+ net/url_request/adblock_intercept.cc               | 323 +++++++++++++++++++++
+ net/url_request/adblock_intercept.h                |  19 ++
+ 12 files changed, 497 insertions(+)
  create mode 100644 net/url_request/adblock_intercept.cc
  create mode 100644 net/url_request/adblock_intercept.h
- delete mode 100644 net/url_request/nochromo_intercept.cc
- delete mode 100644 net/url_request/nochromo_intercept.h
 
 diff --git a/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
@@ -198,6 +192,90 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
        <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
+@@ -62,6 +62,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)
+@@ -269,11 +270,63 @@ void ChromeNetworkDelegate::InitializePrefsOnUIThread(
+   }
+ }
+ 
++#define TRANSPARENT1PXGIF "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
++
+ int ChromeNetworkDelegate::OnBeforeURLRequest(
+     net::URLRequest* request,
+     const net::CompletionCallback& callback,
+     GURL* new_url) {
+ 
++#if defined(OS_ANDROID)
++  if (request) {
++    bool block = false, isValidUrl;
++
++    //LOG(INFO) << "OnBeforeURLRequest " << request->url();
++    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);
++
++    if (isValidUrl && info) {
++#if 0
++      // not working
++      const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter = info->GetWebContentsGetterForRequest();
++      content::WebContents* web_contents = web_contents_getter.Run();
++      if (web_contents) {
++        TabSpecificContentSettings* content_settings =
++        TabSpecificContentSettings::FromWebContents(web_contents);
++        if (content_settings) {
++          bool adblock_enabled = content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_ADS);
++          LOG(INFO) << "adblock_enabled from tab: " << adblock_enabled;
++        }
++      }
++#endif
++
++      if (net::adblock_enabled
++        && content::RESOURCE_TYPE_MAIN_FRAME != info->GetResourceType()
++        && net::adblock_intercept(request->url(),
++                                request->site_for_cookies().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);
+ 
+   if (!enable_referrers_->GetValue())
+@@ -307,6 +360,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
+   return rv;
+ }
+ 
++#undef TRANSPARENT1PXGIF
++
+ int ChromeNetworkDelegate::OnBeforeStartTransaction(
+     net::URLRequest* request,
+     const net::CompletionCallback& 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
@@ -224,16 +302,7 @@ diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settin
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1734,8 +1734,6 @@ component("net") {
-       "url_request/url_fetcher_response_writer.h",
-       "url_request/url_range_request_job.cc",
-       "url_request/url_range_request_job.h",
--      "url_request/nochromo_intercept.cc",
--      "url_request/nochromo_intercept.h",
-       "url_request/url_request.cc",
-       "url_request/url_request.h",
-       "url_request/url_request_context.cc",
-@@ -1793,6 +1791,13 @@ component("net") {
+@@ -1791,6 +1791,13 @@ component("net") {
        "//third_party/zlib",
      ]
  
@@ -251,8 +320,9 @@ diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_inte
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/adblock_intercept.cc
-@@ -0,0 +1,329 @@
+@@ -0,0 +1,323 @@
 +#include "url/gurl.h"
++#include "content/public/common/resource_type.h"
 +
 +#ifdef ADB_TESTER
 +#include <cstddef>
@@ -431,69 +501,69 @@ new file mode 100644
 +  return match;
 +}
 +
-+static int url_match_domain(adblock_entry *entry, const std::string &origin_host) {
-+  if (entry->domains_skip && !origin_host.empty()) {
-+    // filter will not be activated on these domains
++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) {
-+        // this domain is whitelisted, do not further process this rule in any way
-+        return 0;
++        match_domain = false;
++        break;
 +      }
 +    }
 +  }
-+  // fallthrough is desired
 +
-+  if (!entry->domains || origin_host.empty()) {
-+    // undetermined
-+    return 3;
-+  }
-+
-+  // filter will be active only if a domain matches
-+  // if none matches, the filter is to be skipped
-+  for (int d = 0; const char *domain = entry->domains[d]; d++) {
-+    if (domain == origin_host) {
-+      // this domain is one of those that activate the rule
-+      return 1;
++  // 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;
++      }
 +    }
 +  }
-+
-+  // at least one domain should have been found, but none was
-+  // thus the filter must be skipped
-+  return 0;
++  return match_domain;
 +}
 +
-+static int url_match_party(adblock_entry *entry, const GURL &url,
-+                            const std::string &origin_host, int &fp) {
-+  int desired_fp;
++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) {
-+    desired_fp = 0;
++    wanted_fp = false;
 +  } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) {
-+    desired_fp = 1;
++    wanted_fp = true;
 +  } else {
-+    // undetermined, it does not test for first/third party
-+    return 3;
++    // no-op
++    return true;
 +  }
 +
 +  if (origin_host.empty()) {
 +    // cannot match this rule, no origin host to determine first/third party
-+    return 0;
++    return false;
 +  }
 +
 +#ifdef ADB_TESTER
 +//__android_log_print(ANDROID_LOG_INFO, LOG_TAG, "matchFirst=%d matchThird=%d",
 +// matchFirstParty, matchThirdParty);
 +#endif
-+  if (fp == 3) {
++  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?
-+    if (is_first_party(l_host, l_url_host))
-+      fp = 1;
-+    else
-+      fp = 0;
++    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,
@@ -503,14 +573,10 @@ new file mode 100644
 +    free(l_url_host);
 +  }
 +
-+  return fp == desired_fp ? 1 : 0;
++  return fp == wanted_fp;
 +}
 +
-+int adblock_intercept(const GURL &url, const std::string &origin_host) {
-+  //  if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS()) {
-+  //     return 0;
-+  //  }
-+
++int adblock_intercept(const GURL &url, const std::string &origin_host, content::ResourceType resource_type) {
 +  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
 +    const char *c_url = url.spec().c_str();
 +    char *c_url_lower = strtolower(c_url);
@@ -522,7 +588,7 @@ new file mode 100644
 +                        c_url, url.host().c_str(), origin_host.c_str());
 +#endif
 +
-+    int fp = 3;
++    bool checked_fp = false, fp = false;
 +
 +    bool intercept = false;
 +    for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) {
@@ -532,22 +598,19 @@ new file mode 100644
 +      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 (0 == url_match_domain(entry, origin_host)) {
++      if (!url_match_domain(entry, origin_host))
 +        continue;
-+      }
-+      // fallthrough with values 3 (undetermined / no domain options) or 1 (matched)
 +
 +      // 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 (0 == url_match_party(entry, url, origin_host, fp))
++      if (!url_match_party(entry, url, origin_host, checked_fp, fp))
 +        continue;
 +
 +#ifdef ADBLOCK_LOG
@@ -569,12 +632,12 @@ new file mode 100644
 +
 +    if (intercept) {
 +#ifdef ADBLOCK_LOG
-+      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked (fp=%d)", fp);
++      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked");
 +#endif
 +      return 1;
 +    }
 +#ifdef ADBLOCK_LOG
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass (fp=%d)", fp);
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass");
 +#endif
 +  }
 +  return 0;
@@ -585,11 +648,12 @@ diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_inter
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/adblock_intercept.h
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,19 @@
 +#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +
 +#include "url/gurl.h"
++#include "content/public/common/resource_type.h"
 +
 +namespace net {
 +
@@ -597,213 +661,13 @@ new file mode 100644
 +int adblock_rules_count();
 +#endif
 +
-+int adblock_intercept(const GURL &url, const std::string &origin_host);
++int adblock_intercept(const GURL &url, const std::string &origin_host, content::ResourceType resource_type);
 +
 +extern bool adblock_enabled;
 +
 +} // namespace net
 +
 +#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
-deleted file mode 100644
---- a/net/url_request/nochromo_intercept.cc
-+++ /dev/null
-@@ -1,116 +0,0 @@
--#include "url/gurl.h"
--#include "net/url_request/nochromo_entries.h"
--
--#include <android/log.h>
--
--namespace net {
--  
--#define NOCHROMO_LOG 0
--#define NOCHROMO_LOG_MORE 0
--
--static char* strtolower(const char* str) {
--  int len = strlen(str);
--  char* ret = (char*)malloc(len + 1);
--  ret[len] = '\0';
--  for (int i = 0; i < len; i++) {
--    if ((65 <= str[i]) && (str[i] <= 90)) {
--      ret[i] = str[i] + 32;
--    } else {
--      ret[i] = str[i];
--    }
--  }
--  return ret;
--}
--
--static char* strtosep(const char* str) {
--  int len = strlen(str);
--  char* ret = (char*)malloc(len + 3);
--  ret[0] = '^';
--  ret[len + 1] = '^';
--  ret[len + 2] = '\0';
--  for (int i = 0; i < len; i++) {
--    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
--      ret[i + 1] = '^';
--    } else {
--      ret[i + 1] = str[i];
--    }
--  }
--  return ret;
--}
--
--int nochromo_intercept(const GURL& url) {
--  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
--    const char* c_url = url.spec().c_str();
--    char* c_url_lower = strtolower(c_url);
--    char* c_url_sep = strtosep(c_url);
--    char* c_url_lower_sep = strtosep(c_url_lower);
--    
--    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
--    
--    bool intercept = false;
--    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
--      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
--      
--      // no use checking rules when we're intercepting, or exceptions when not
--      bool check =
--        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
--        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
--      
--      if (check) {
--        bool match = false;
--        
--        // select comparison string based on case and separator presence (separator takes some shortcuts)
--        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
--        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
--        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
--        
--        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
--        
--        // check for all match parts at >= position of last match
--        const char* last = match_url;
--        for (int m = 0; m < entry->matchcount; m++) {
--          const char* pos = strstr(last, entry->matches[m]);
--          match = (pos != NULL);
--          
--          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
--          
--          // check if the url starts with the first match part
--          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
--          
--          // check if the url ends with the last match part
--          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
--          
--          // check domain match
--          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
--          
--          // short circuit
--          if (!match) break;
--        }
--        
--        if (match) {
--          if (NOCHROMO_LOG) {
--            if (!intercept) {
--              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
--            } else {
--              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
--            }
--          }
--          intercept = !intercept;
--        }
--      }
--    }
--    
--    free(c_url_sep);
--    free(c_url_lower);
--    free(c_url_lower_sep);
--    
--    if (intercept) {
--      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
--      return 1;
--    }
--    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
--  }
--  return 0;
--}
--
--}  // namespace net
-\ No newline at end of file
-diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
-deleted file mode 100644
---- a/net/url_request/nochromo_intercept.h
-+++ /dev/null
-@@ -1,13 +0,0 @@
--#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
--#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
--
--#include "url/gurl.h"
--
--namespace net {
--
--GURL nochromo_intercepted = GURL("http://127.0.0.1/");
--int nochromo_intercept(const GURL& url);
--
--}  // namespace net
--
--#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
---- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -44,7 +44,9 @@
- #include "url/gurl.h"
- #include "url/origin.h"
- 
--#include "net/url_request/nochromo_intercept.h"
-+#if defined(OS_ANDROID)
-+#include "net/url_request/adblock_intercept.h"
-+#endif
- 
- #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/network_error_logging/network_error_logging_service.h"
-@@ -585,8 +587,6 @@ URLRequest::URLRequest(const GURL& url,
-   // Sanity check out environment.
-   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
- 
--  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
--
-   context->url_requests()->insert(this);
-   net_log_.BeginEvent(
-       NetLogEventType::REQUEST_ALIVE,
-@@ -665,6 +665,36 @@ void URLRequest::StartJob(URLRequestJob* job) {
-     }
-   }
- 
-+#if defined(OS_ANDROID)
-+  if (net::adblock_enabled) {
-+    std::string initiatorHost;
-+    if (initiator_.has_value()) {
-+      initiatorHost = initiator_.value().host();
-+    }
-+
-+    if (adblock_intercept(url(), initiatorHost)) {
-+      std::string source("delegate");
-+      net_log_.AddEvent(NetLogEventType::CANCELLED,
-+                        NetLog::StringCallback("source", &source));
-+
-+      job_.reset(new URLRequestErrorJob(
-+          this, network_delegate_, ERR_BLOCKED_BY_CLIENT));
-+
-+      job_->SetExtraRequestHeaders(extra_request_headers_);
-+      job_->SetPriority(priority_);
-+      job_->SetRequestHeadersCallback(request_headers_callback_);
-+      job_->SetResponseHeadersCallback(response_headers_callback_);
-+
-+      if (upload_data_stream_.get())
-+        job_->SetUpload(upload_data_stream_.get());
-+
-+      // on fallthrough the initial status will be ERR_IO_PENDING,
-+      // but the URLRequestErrorJob will then call NotifyResponseStarted
-+      // with the correct ERR_BLOCKED_BYCLIENT status
-+    }
-+  }
-+#endif
-+
-   // Start() always completes asynchronously.
-   //
-   // Status is generally set by URLRequestJob itself, but Start() calls
 -- 
 2.7.4
 

patches/BRM048_url_request-hooks-and-ad-url-data.patch

@@ -1,189 +0,0 @@
-From: NoChromo <nochromo@nochromo.com>
-Date: Sun, 3 Apr 2016 12:44:50 +0800
-Subject: url_request: hooks and ad url data
-
----
- net/BUILD.gn                          |   2 +
- net/url_request/nochromo_intercept.cc | 116 ++++++++++++++++++++++++++++++++++
- net/url_request/nochromo_intercept.h  |  13 ++++
- net/url_request/url_request.cc        |   4 ++
- 4 files changed, 135 insertions(+)
- create mode 100644 net/url_request/nochromo_intercept.cc
- create mode 100644 net/url_request/nochromo_intercept.h
-
-diff --git a/net/BUILD.gn b/net/BUILD.gn
---- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1734,6 +1734,8 @@ component("net") {
-       "url_request/url_fetcher_response_writer.h",
-       "url_request/url_range_request_job.cc",
-       "url_request/url_range_request_job.h",
-+      "url_request/nochromo_intercept.cc",
-+      "url_request/nochromo_intercept.h",
-       "url_request/url_request.cc",
-       "url_request/url_request.h",
-       "url_request/url_request_context.cc",
-diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
-new file mode 100644
---- /dev/null
-+++ b/net/url_request/nochromo_intercept.cc
-@@ -0,0 +1,116 @@
-+#include "url/gurl.h"
-+#include "net/url_request/nochromo_entries.h"
-+
-+#include <android/log.h>
-+
-+namespace net {
-+  
-+#define NOCHROMO_LOG 0
-+#define NOCHROMO_LOG_MORE 0
-+
-+static char* strtolower(const char* str) {
-+  int len = strlen(str);
-+  char* ret = (char*)malloc(len + 1);
-+  ret[len] = '\0';
-+  for (int i = 0; i < len; i++) {
-+    if ((65 <= str[i]) && (str[i] <= 90)) {
-+      ret[i] = str[i] + 32;
-+    } else {
-+      ret[i] = str[i];
-+    }
-+  }
-+  return ret;
-+}
-+
-+static char* strtosep(const char* str) {
-+  int len = strlen(str);
-+  char* ret = (char*)malloc(len + 3);
-+  ret[0] = '^';
-+  ret[len + 1] = '^';
-+  ret[len + 2] = '\0';
-+  for (int i = 0; i < len; i++) {
-+    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
-+      ret[i + 1] = '^';
-+    } else {
-+      ret[i + 1] = str[i];
-+    }
-+  }
-+  return ret;
-+}
-+
-+int nochromo_intercept(const GURL& url) {
-+  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
-+    const char* c_url = url.spec().c_str();
-+    char* c_url_lower = strtolower(c_url);
-+    char* c_url_sep = strtosep(c_url);
-+    char* c_url_lower_sep = strtosep(c_url_lower);
-+    
-+    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
-+    
-+    bool intercept = false;
-+    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
-+      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
-+      
-+      // no use checking rules when we're intercepting, or exceptions when not
-+      bool check =
-+        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
-+        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
-+      
-+      if (check) {
-+        bool match = false;
-+        
-+        // select comparison string based on case and separator presence (separator takes some shortcuts)
-+        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
-+        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
-+        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
-+        
-+        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
-+        
-+        // check for all match parts at >= position of last match
-+        const char* last = match_url;
-+        for (int m = 0; m < entry->matchcount; m++) {
-+          const char* pos = strstr(last, entry->matches[m]);
-+          match = (pos != NULL);
-+          
-+          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
-+          
-+          // check if the url starts with the first match part
-+          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
-+          
-+          // check if the url ends with the last match part
-+          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
-+          
-+          // check domain match
-+          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
-+          
-+          // short circuit
-+          if (!match) break;
-+        }
-+        
-+        if (match) {
-+          if (NOCHROMO_LOG) {
-+            if (!intercept) {
-+              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
-+            } else {
-+              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
-+            }
-+          }
-+          intercept = !intercept;
-+        }
-+      }
-+    }
-+    
-+    free(c_url_sep);
-+    free(c_url_lower);
-+    free(c_url_lower_sep);
-+    
-+    if (intercept) {
-+      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
-+      return 1;
-+    }
-+    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
-+  }
-+  return 0;
-+}
-+
-+}  // namespace net
-\ No newline at end of file
-diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
-new file mode 100644
---- /dev/null
-+++ b/net/url_request/nochromo_intercept.h
-@@ -0,0 +1,13 @@
-+#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-+#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-+
-+#include "url/gurl.h"
-+
-+namespace net {
-+
-+GURL nochromo_intercepted = GURL("http://127.0.0.1/");
-+int nochromo_intercept(const GURL& url);
-+
-+}  // namespace net
-+
-+#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
---- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -44,6 +44,8 @@
- #include "url/gurl.h"
- #include "url/origin.h"
- 
-+#include "net/url_request/nochromo_intercept.h"
-+
- #if BUILDFLAG(ENABLE_REPORTING)
- #include "net/network_error_logging/network_error_logging_service.h"
- #include "net/reporting/reporting_service.h"
-@@ -583,6 +585,8 @@ URLRequest::URLRequest(const GURL& url,
-   // Sanity check out environment.
-   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
- 
-+  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
-+
-   context->url_requests()->insert(this);
-   net_log_.BeginEvent(
-       NetLogEventType::REQUEST_ALIVE,
--- 
-2.7.4
-

patches/BRM049_User-Agent-anonymize.patch

@@ -0,0 +1,110 @@
+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.
+---
+ components/version_info/version_info.cc | 17 ++++++++++++-
+ content/common/user_agent.cc            | 45 +++++++++++++++++++--------------
+ 2 files changed, 42 insertions(+), 20 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,28 @@
+ #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 7:
++      return "Chrome/63.0.3239.111";
++    case 6:
++      return "Chrome/63.0.3239.83";
++    case 5:
++    case 4:
++      return "Chrome/62.0.3202.84";
++  }
++  // version 8 and above
++  return "Chrome/67.0.3396.87";
+ }
+ 
+ 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
+@@ -59,26 +59,33 @@ std::string BuildOSCpuInfo() {
+       architecture_token = "; Win64; IA64";
+   }
+ #elif defined(OS_ANDROID)
+-  std::string android_version_str = base::SysInfo::OperatingSystemVersion();
++  int32_t major, minor, bugfix;
++  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
++  std::string android_version_str = base::StringPrintf("%d.%d.%d", major, minor, bugfix);
+ 
++  // Send information about the device and buld ID.
++  // Use a common device/build ID based on Android major version.
+   std::string android_info_str;
+-
+-  // Send information about the device.
+-  bool semicolon_inserted = false;
+-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
+-  std::string android_device_name = base::SysInfo::HardwareModelName();
+-  if ("REL" == android_build_codename && android_device_name.size() > 0) {
+-    android_info_str += "; " + android_device_name;
+-    semicolon_inserted = true;
+-  }
+-
+-  // Append the build ID.
+-  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
+-  if (android_build_id.size() > 0) {
+-    if (!semicolon_inserted) {
+-      android_info_str += ";";
+-    }
+-    android_info_str += " Build/" + android_build_id;
++  switch (major) {
++    case 7:
++      // Chrome/63.0.3239.111
++      android_info_str = "SM-J730GM Build/NRD90M";
++      break;
++    case 6:
++      // Chrome/63.0.3239.83
++      android_info_str = "SM-G532G Build/MMB29T";
++      break;
++    case 5:
++      // Chrome/62.0.3202.84
++      android_info_str = "A37fw Build/LMY47V";
++      break;
++    case 4:
++      // Chrome/62.0.3202.84
++      android_info_str = "SM-G7102 Build/KOT49H";
++      break;
++    default: // version 8 and above
++      android_info_str = "SM-G950U Build/R16NW";
++      break;
+   }
+ #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
+   // Should work on any Posix system.
+@@ -115,7 +122,7 @@ std::string BuildOSCpuInfo() {
+       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)
+-- 
+2.7.4
+

patches/BRM050_User-Agent-anonymize.patch

@@ -1,54 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 21 Mar 2018 14:15:28 +0100
-Subject: User Agent: anonymize
-
-Remove device name and build id
----
- content/common/user_agent.cc | 25 ++-----------------------
- 1 file changed, 2 insertions(+), 23 deletions(-)
-
-diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
---- a/content/common/user_agent.cc
-+++ b/content/common/user_agent.cc
-@@ -60,26 +60,6 @@ std::string BuildOSCpuInfo() {
-   }
- #elif defined(OS_ANDROID)
-   std::string android_version_str = base::SysInfo::OperatingSystemVersion();
--
--  std::string android_info_str;
--
--  // Send information about the device.
--  bool semicolon_inserted = false;
--  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
--  std::string android_device_name = base::SysInfo::HardwareModelName();
--  if ("REL" == android_build_codename && android_device_name.size() > 0) {
--    android_info_str += "; " + android_device_name;
--    semicolon_inserted = true;
--  }
--
--  // Append the build ID.
--  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
--  if (android_build_id.size() > 0) {
--    if (!semicolon_inserted) {
--      android_info_str += ";";
--    }
--    android_info_str += " Build/" + android_build_id;
--  }
- #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
-   // Should work on any Posix system.
-   struct utsname unixinfo;
-@@ -115,9 +95,8 @@ std::string BuildOSCpuInfo() {
-       os_minor_version,
-       os_bugfix_version
- #elif defined(OS_ANDROID)
--      "Android %s%s",
--      android_version_str.c_str(),
--      android_info_str.c_str()
-+      "Android %s",
-+      android_version_str.c_str()
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
-                       "%s %s",
-                       unixinfo.sysname,  // e.g. Linux
--- 
-2.7.4
-

patches/BRM052_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch

@@ -4,7 +4,7 @@ Subject: getClientRects, getBoundingClientRect, measureText: add
  fingerprinting mitigation
 
 Scale the result of Range::getClientRects, Element::getBoundingClientRect and
-Canvas::measureText by a random +/-3/10000th of the original value for each
+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
@@ -36,9 +36,9 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
    GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
        quads, *element_layout_object);
 +
-+  // scale all quads by 3/10000th
-+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
-+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
++  // scale all quads
++  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.000003;
 +
 +  for (FloatQuad& quad : quads) {
 +    quad.Scale(shuffleX, shuffleY);
@@ -52,9 +52,9 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
    GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                          *element_layout_object);
 +
-+  // scale rect by 3/10000th
-+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
-+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
++  // scale rect by 3/1000000th
++  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.000003;
 +
 +  result.Scale(shuffleX, shuffleY);
 +
@@ -77,9 +77,9 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
    Vector<FloatQuad> quads;
    GetBorderAndTextQuads(quads);
  
-+  // scale all quads by 3/10000th
-+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
-+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
++  // scale all quads by 3/1000000th
++  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.000003;
 +
 +  for (FloatQuad& quad : quads) {
 +    quad.Scale(shuffleX, shuffleY);
@@ -92,9 +92,9 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 -  return DOMRect::FromFloatRect(BoundingRect());
 +  auto rect = BoundingRect();
 +
-+  // scale rect by 3/10000th
-+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
-+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
++  // scale rect by 3/1000000th
++  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.000003;
 +
 +  rect.Scale(shuffleX, shuffleY);
 +
@@ -162,8 +162,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 +  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
                               GetState().GetTextAlign(), text);
 +
-+  // scale text metrics by 3/10000th
-+  auto shuffleFactor = 1 + (base::RandDouble() - 0.5) * 0.0003;
++  // scale text metrics by 3/1000000th
++  auto shuffleFactor = 1 + (base::RandDouble() - 0.5) * 0.000003;
 +  textMetrics->Shuffle(shuffleFactor);
 +
 +  return textMetrics;

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

@@ -6,32 +6,31 @@ 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                           |  9 +++++++++
- chrome/browser/flag_descriptions.cc                     |  4 ++++
- chrome/browser/flag_descriptions.h                      |  3 +++
- .../common/network_features.cc                          |  4 ++++
- .../common/network_features.h                           |  4 ++++
- .../common/network_switch_list.h                        |  4 ++++
- net/socket/client_socket_pool_manager.cc                | 17 +++++++++++++++++
- 7 files changed, 45 insertions(+)
+ 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
-@@ -798,6 +798,12 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -798,6 +798,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
       net::kEffectiveConnectionType4G},
  };
  
 +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
-+    {features::kMaxConnectionsPerHostChoiceDefault, "", "0"},
-+    {features::kMaxConnectionsPerHostChoice6, switches::kMaxConnectionsPerHost, "6"},
++    {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 ==
-@@ -2398,6 +2404,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2398,6 +2403,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kMaterialDesignIncognitoNTPName,
       flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
@@ -50,7 +49,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
  
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
-+     "Customize maximum allowed connections per host (experimental).";
++     "Customize maximum allowed connections per host.";
 +
  const char kMediaRouterCastAllowAllIPsName[] =
      "Connect to Cast devices on all IP addresses";
@@ -71,12 +70,11 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 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,10 @@
+@@ -8,6 +8,9 @@
  
  namespace features {
  
-+const char kMaxConnectionsPerHostChoiceDefault[] = "Default",
-+                 kMaxConnectionsPerHostChoice6[] = "6",
++const char kMaxConnectionsPerHostChoiceDefault[] = "6",
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
  const base::Feature kTokenBinding{"token-binding",
@@ -132,17 +130,16 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  
  namespace net {
  
-@@ -316,6 +319,20 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -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;
-+      if (!base::StringToInt(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kMaxConnectionsPerHost),
-+                         &maxConnectionsPerHost)) {
-+        LOG(DFATAL) << "--" << switches::kMaxConnectionsPerHost << " only accepts integers as arguments";
-+        maxConnectionsPerHost = 0;
++      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;

patches/BRM058_Add-flag-to-show-hide-NTP-tiles.patch

@@ -14,17 +14,17 @@ Subject: Add flag to show/hide NTP tiles
 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
-@@ -1285,6 +1285,10 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWebrtcNewEncodeCpuLoadEstimatorDescription, kOsAll,
-      FEATURE_VALUE_TYPE(media::kNewEncodeCpuLoadEstimator)},
- #if defined(OS_ANDROID)
+@@ -1915,6 +1915,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kChromeModernAlternateCardLayoutName,
+      flag_descriptions::kChromeModernAlternateCardLayoutDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kChromeModernAlternateCardLayout)},
 +    {"hide-ntp-tiles",
 +     flag_descriptions::kHideNTPTilesName,
 +     flag_descriptions::kHideNTPTilesDescription, kOsAndroid,
 +     SINGLE_VALUE_TYPE(switches::kHideNTPTiles)},
-     {"clear-old-browsing-data", flag_descriptions::kClearOldBrowsingDataName,
-      flag_descriptions::kClearOldBrowsingDataDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(features::kClearOldBrowsingData)},
+     {"force-enable-home-page-button", flag_descriptions::kHomePageButtonName,
+      flag_descriptions::kHomePageButtonDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kHomePageButtonForceEnabled)},
 diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
 --- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
 +++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc

patches/BRM059_Add-custom-tab-intents-privacy-option.patch

@@ -0,0 +1,119 @@
+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    |  9 +++++++--
+ .../chrome/browser/preferences/privacy/PrivacyPreferences.java | 10 ++++++++++
+ chrome/android/java/strings/android_chrome_strings.grd         |  7 +++++++
+ 5 files changed, 32 insertions(+), 2 deletions(-)
+
+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
+@@ -52,4 +52,9 @@
+         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" />
+ </PreferenceScreen>
+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
+@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.metrics.MediaNotificationUma;
+ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
+ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
++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;
+@@ -149,9 +150,13 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+         recordIntentMetrics();
+ 
+         mIsVrIntent = VrIntentUtils.isVrIntent(mIntent);
+-        boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
++
++        if (ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false)) {
++            mIsCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
+                 || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
+-        mIsCustomTabIntent = isCustomTabIntent;
++        } else {
++            mIsCustomTabIntent = 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
+@@ -37,6 +37,7 @@ public class PrivacyPreferences extends PreferenceFragment
+             "safe_browsing_extended_reporting";
+     private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
+             "safe_browsing_scout_reporting";
++    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
+     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";
+@@ -100,6 +101,11 @@ public class PrivacyPreferences extends PreferenceFragment
+                     ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING;
+         preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove));
+ 
++        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
++        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
++        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
++
+         ChromeBaseCheckBoxPreference safeBrowsingPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
+         safeBrowsingPref.setOnPreferenceChangeListener(this);
+@@ -123,6 +129,10 @@ public class PrivacyPreferences extends PreferenceFragment
+                    || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
+             PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
+                     (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_NETWORK_PREDICTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+             recordNetworkPredictionEnablingUMA((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
+@@ -3423,6 +3423,13 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr
+         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.7.4
+

patches/BRM060_Add-flag-to-disable-custom-tab-intents.patch

@@ -1,117 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 8 Jul 2018 23:06:52 +0200
-Subject: Add flag to disable custom tab intents
-
-Custom tab intents allow apps to open URLs with a minimal browser UI;
-this flag allows disabling this functionality altogether and all custom tab
-intents will instead open as regular URLs.
----
- .../java/src/org/chromium/chrome/browser/ChromeSwitches.java      | 3 +++
- .../src/org/chromium/chrome/browser/LaunchIntentDispatcher.java   | 8 ++++++--
- chrome/browser/about_flags.cc                                     | 4 ++++
- chrome/browser/flag_descriptions.cc                               | 4 ++++
- chrome/browser/flag_descriptions.h                                | 3 +++
- chrome/common/chrome_switches.cc                                  | 3 +++
- chrome/common/chrome_switches.h                                   | 1 +
- 7 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
-@@ -177,6 +177,9 @@ public abstract class ChromeSwitches {
-     /** Open all custom tabs in a new task. Used only for experimental purposes. */
-     public static final String OPEN_CUSTOM_TABS_IN_NEW_TASK = "open-custom-tabs-in-new-task";
- 
-+    /** Disallow custom tab intents. */
-+    public static final String DISALLOW_CUSTOM_TAB_INTENT = "disallow-custom-tab-intent";
-+
-     /**
-      * Don't crash on undispatched VIEW intents sent to .Main.
-      * See ChromeTabbedActivity.maybeDispatchExplicitMainViewIntent() for more info.
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -149,9 +149,13 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
-         recordIntentMetrics();
- 
-         mIsVrIntent = VrIntentUtils.isVrIntent(mIntent);
--        boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
-+
-+        if (!CommandLine.getInstance().hasSwitch(ChromeSwitches.DISALLOW_CUSTOM_TAB_INTENT)) {
-+            mIsCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
-                 || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
--        mIsCustomTabIntent = isCustomTabIntent;
-+        } else {
-+            mIsCustomTabIntent = false;
-+        }
-     }
- 
-     /**
-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
-@@ -1302,6 +1302,10 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kMediaScreenCaptureName,
-      flag_descriptions::kMediaScreenCaptureDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)},
-+    {"disallow-custom-tab-intent",
-+     flag_descriptions::kDisallowCustomTabIntentName,
-+     flag_descriptions::kDisallowCustomTabIntentDescription, kOsAndroid,
-+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisallowCustomTabIntent)},
- #endif  // OS_ANDROID
- // Native client is compiled out if ENABLE_NACL is not set.
- #if BUILDFLAG(ENABLE_NACL)
-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
-@@ -2043,6 +2043,10 @@ const char kContextualSearchSecondTapDescription[] =
-     "Enables triggering on a second tap gesture even when Ranker would "
-     "normally suppress that tap.";
- 
-+const char kDisallowCustomTabIntentName[] = "Disallow custom tab intent";
-+const char kDisallowCustomTabIntentDescription[] =
-+    "Do not allow apps to open custom tab intents and use a regular browsing interaction instead.";
-+
- const char kDontPrefetchLibrariesName[] = "Don't Prefetch Libraries";
- const char kDontPrefetchLibrariesDescription[] =
-     "Don't prefetch libraries after loading.";
-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
-@@ -1244,6 +1244,9 @@ extern const char kContextualSearchRankerQueryDescription[];
- extern const char kContextualSearchSecondTapName[];
- extern const char kContextualSearchSecondTapDescription[];
- 
-+extern const char kDisallowCustomTabIntentName[];
-+extern const char kDisallowCustomTabIntentDescription[];
-+
- extern const char kDontPrefetchLibrariesName[];
- extern const char kDontPrefetchLibrariesDescription[];
- 
-diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
---- a/chrome/common/chrome_switches.cc
-+++ b/chrome/common/chrome_switches.cc
-@@ -218,6 +218,9 @@ const char kDisableExtensions[]             = "disable-extensions";
- // Disable extensions except those specified in a comma-separated list.
- const char kDisableExtensionsExcept[] = "disable-extensions-except";
- 
-+// Disallow apps to use custom tab intents and use a regular URL open intent instead.
-+const char kDisallowCustomTabIntent[] = "disallow-custom-tab-intent";
-+
- // Disable checking for user opt-in for extensions that want to inject script
- // into file URLs (ie, always allow it). This is used during automated testing.
- const char kDisableExtensionsFileAccessCheck[] =
-diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
---- a/chrome/common/chrome_switches.h
-+++ b/chrome/common/chrome_switches.h
-@@ -72,6 +72,7 @@ extern const char kDisableCastStreamingHWEncoding[];
- extern const char kDisableClientSidePhishingDetection[];
- extern const char kDisableComponentExtensionsWithBackgroundPages[];
- extern const char kDisableComponentUpdate[];
-+extern const char kDisallowCustomTabIntent[];
- extern const char kDisableDefaultApps[];
- extern const char kDisableDeviceDiscoveryNotifications[];
- extern const char kDisableDomainReliability[];
--- 
-2.7.4
-

patches/BRM060_Add-privacy-option-to-keep-cookies-until-session-exit.patch

@@ -0,0 +1,201 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 28 Aug 2018 23:27:23 +0200
+Subject: Add privacy option to keep cookies until session exit
+
+---
+ chrome/android/java/res/values/values.xml          |  3 +++
+ .../android/java/res/xml/website_preferences.xml   |  7 +++++++
+ .../browser/preferences/PrefServiceBridge.java     | 10 +++++++++
+ .../website/SingleCategoryPreferences.java         | 24 ++++++++++++++++++++++
+ .../java/strings/android_chrome_strings.grd        |  6 ++++++
+ .../android/preferences/pref_service_bridge.cc     | 19 +++++++++++++++++
+ 6 files changed, 69 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
+@@ -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
+@@ -19,6 +19,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
+@@ -256,6 +256,10 @@ public class PrefServiceBridge {
+         return nativeGetBlockThirdPartyCookiesEnabled();
+     }
+ 
++    public boolean isCookiesSessionOnlyEnabled() {
++        return nativeGetCookiesSessionOnlyEnabled();
++    }
++
+     /**
+      * @return Whether third-party cookie blocking is configured by policy
+      */
+@@ -722,6 +726,10 @@ public class PrefServiceBridge {
+         nativeSetBlockThirdPartyCookiesEnabled(enabled);
+     }
+ 
++    public void setCookiesSessionOnlyEnabled(boolean enabled) {
++        nativeSetCookiesSessionOnlyEnabled(enabled);
++    }
++
+     public void setClipboardEnabled(boolean allow) {
+         nativeSetClipboardEnabled(allow);
+     }
+@@ -1107,6 +1115,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();
+@@ -1153,6 +1162,7 @@ public class PrefServiceBridge {
+     private native void nativeSetAllowCookiesEnabled(boolean allow);
+     private native void nativeSetBackgroundSyncEnabled(boolean allow);
+     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
++    private native void nativeSetCookiesSessionOnlyEnabled(boolean enabled);
+     private native void nativeSetClipboardEnabled(boolean allow);
+     private native void nativeSetDoNotTrackEnabled(boolean enabled);
+     private native void nativeSetRememberPasswordsEnabled(boolean allow);
+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
+@@ -98,6 +98,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+     // Keys for individual preferences.
+     public static final String READ_WRITE_TOGGLE_KEY = "read_write_toggle";
+     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";
+@@ -447,6 +448,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             } else if (mCategory.showCookiesSites()) {
+                 PrefServiceBridge.getInstance().setAllowCookiesEnabled((boolean) newValue);
+                 updateThirdPartyCookiesCheckBox();
++                updateCookiesSessionOnlyCheckBox();
+             } else if (mCategory.showGeolocationSites()) {
+                 PrefServiceBridge.getInstance().setAllowLocationEnabled((boolean) newValue);
+             } else if (mCategory.showJavaScriptSites()) {
+@@ -491,6 +493,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             getInfoForOrigins();
+         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
+             PrefServiceBridge.getInstance().setBlockThirdPartyCookiesEnabled(!((boolean) newValue));
++        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
++            PrefServiceBridge.getInstance().setCookiesSessionOnlyEnabled(!((boolean) newValue));
+         } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
+             PrefServiceBridge.getInstance().setNotificationsVibrateEnabled((boolean) newValue);
+         }
+@@ -726,6 +730,16 @@ public class SingleCategoryPreferences extends PreferenceFragment
+             getPreferenceScreen().removePreference(thirdPartyCookies);
+         }
+ 
++        // Configure/hide the keep cookies until session is over toggle, as needed.
++        Preference cookiesSessionOnly = getPreferenceScreen().findPreference(
++                COOKIES_SESSION_ONLY_TOGGLE_KEY);
++        if (mCategory.showCookiesSites()) {
++            cookiesSessionOnly.setOnPreferenceChangeListener(this);
++            updateCookiesSessionOnlyCheckBox();
++        } else {
++            getPreferenceScreen().removePreference(cookiesSessionOnly);
++        }
++
+         // Configure/hide the notifications vibrate toggle, as needed.
+         Preference notificationsVibrate =
+                 getPreferenceScreen().findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
+@@ -859,6 +873,16 @@ 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().isAcceptCookiesEnabled());
++//        cookiesSessionOnlyPref.setManagedPreferenceDelegate(
++//                preference -> PrefServiceBridge.getInstance().isCookiesSessionOnlyPrefManaged());
++    }
++
+     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
+@@ -800,6 +800,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
+@@ -276,6 +276,14 @@ 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());
++  return CONTENT_SETTING_SESSION_ONLY == host_content_settings_map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, nullptr);
++}
++
+ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj) {
+@@ -724,6 +732,17 @@ 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());
++  host_content_settings_map->SetDefaultContentSetting(
++      CONTENT_SETTINGS_TYPE_COOKIES,
++      enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_SESSION_ONLY);
++}
++
+ static void JNI_PrefServiceBridge_SetRememberPasswordsEnabled(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj,
+-- 
+2.7.4
+

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

@@ -0,0 +1,817 @@
+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
+
+---
+ .../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   |  21 ++
+ .../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   | 219 +++++++++++++++++++++
+ chrome/browser/android/bookmarks/bookmark_bridge.h |  19 +-
+ 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, 387 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
+@@ -82,6 +82,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();
+@@ -125,6 +131,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);
+     }
+@@ -134,6 +142,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);
+         }
+@@ -166,6 +176,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
+@@ -18,6 +18,7 @@ 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.WindowAndroid;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -508,6 +509,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.
+@@ -906,6 +925,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
+@@ -22,6 +22,7 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.BasicNativePage;
+ 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.partnerbookmarks.PartnerBookmarksReader;
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -30,6 +31,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;
+ 
+@@ -53,6 +55,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;
+@@ -269,6 +272,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)}.
+@@ -416,6 +426,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
+@@ -209,6 +209,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
+@@ -135,6 +135,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",
+@@ -2422,8 +2426,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",
+@@ -2510,8 +2512,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,156 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+   return count;
+ }
+ 
++void BookmarkBridge::ImportBookmarks(JNIEnv* env,
++                                       const JavaParamRef<jobject>& obj,
++                                       const JavaParamRef<jobject>& java_window) {
++  DCHECK(IsLoaded());
++
++  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;
++
++  const base::FilePath file_path;
++
++  select_file_dialog_->SelectFile(
++        ui::SelectFileDialog::SELECT_OPEN_FILE,
++        base::string16(),
++        file_path,
++        NULL,
++        0,
++        base::FilePath::StringType(),
++        window,
++        NULL);
++}
++
++void ExporterCallback(Profile* profile, const base::FilePath& path) {
++  bookmark_html_writer::WriteBookmarks(profile, path, NULL);
++  //NOTE: nothing will be written if write permission has not been granted before
++  LOG(INFO) << "Bookmarks exported successfully in " << path;
++}
++
++void BookmarkBridge::ExportBookmarks(JNIEnv* env,
++                                       const JavaParamRef<jobject>& obj) {
++  DCHECK(IsLoaded());
++  base::FilePath path;
++  if (!base::android::GetDownloadsDirectory(&path)) {
++    LOG(ERROR) << "Could not retrieve downloads directory for bookmarks export";
++    return;
++  }
++
++  path = path.Append(FILE_PATH_LITERAL("bookmarks.html"));
++
++//  base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
++//                            base::BindOnce(&ExporterCallback, profile_, path));
++  ExporterCallback(profile_, path);
++}
++
++// 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 ImporterCallback(Profile* profile, const base::FilePath& path, const std::string& contents) {
++  // this 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 " << path;
++}
++
++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 content(buffer.begin(), buffer.end());
++//  base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
++//                            base::BindOnce(&ImporterCallback, profile_, path, content));
++  ImporterCallback(profile_, path, content);
++}
++
++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,
+@@ -267,6 +283,7 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+   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
+@@ -109,12 +109,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("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
+@@ -434,6 +434,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
+@@ -55,8 +55,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",
+@@ -160,6 +158,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.7.4
+

patches/BRM064_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
+@@ -15,6 +15,11 @@
+         android:summary="@string/search_suggestions_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="safe_browsing_extended_reporting"
+         android:title="@string/safe_browsing_extended_reporting_title"
+         android:summary="@string/safe_browsing_extended_reporting_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
+@@ -1004,8 +1004,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;
+@@ -14,6 +15,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;
+@@ -45,6 +47,7 @@ public class PrivacyPreferences extends PreferenceFragment
+     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";
++    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+ 
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+ 
+@@ -115,6 +118,11 @@ public class PrivacyPreferences extends PreferenceFragment
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
+         canMakePaymentPref.setOnPreferenceChangeListener(this);
+ 
++        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
++        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
++        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
++
+         updateSummaries();
+     }
+ 
+@@ -141,6 +149,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
+@@ -3463,6 +3463,12 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr
+       <message name="IDS_NEAR_OOM_INTERVENTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can resume what it was doing.">
+          Resume
+       </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>
+     </messages>
+   </release>
+ </grit>
+-- 
+2.7.4
+

patches/BRM065_Add-an-always-incognito-mode.patch

@@ -0,0 +1,313 @@
+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    |  7 +++
+ .../chrome/browser/tabmodel/ChromeTabCreator.java  | 24 +++++++-
+ .../java/strings/android_chrome_strings.grd        |  6 ++
+ chrome/android/java_sources.gni                    |  1 +
+ 8 files changed, 130 insertions(+), 1 deletion(-)
+ 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
+@@ -20,6 +20,11 @@
+         android:summary="@string/close_tabs_on_exit_summary"
+         android:defaultValue="false" />
+     <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" />
++    <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" />
+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
+@@ -243,6 +243,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+     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;
+@@ -1593,6 +1594,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             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;
+@@ -166,6 +170,14 @@ public class AppMenuHandler {
+         if (mDelegate.shouldShowHeader(appRect.height())) {
+             headerView = mDelegate.getHeaderView();
+         }
++
++        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, headerView, mHighlightMenuId);
+         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.view.ContextMenu;
+ import android.webkit.MimeTypeMap;
+ 
+ import org.chromium.base.CollectionUtil;
++import org.chromium.base.ContextUtils;
+ import org.chromium.base.library_loader.LibraryProcessType;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.R;
+@@ -45,6 +46,7 @@ import java.util.Set;
+  */
+ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+     private static final String TAG = "CCMenuPopulator";
++    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
+     private static final ShareContextMenuItem SHARE_IMAGE =
+             new ShareContextMenuItem(R.drawable.ic_share_white_24dp,
+                     R.string.contextmenu_share_image, R.id.contextmenu_share_image, false);
+@@ -463,6 +465,11 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+             disabledOptions.add(ChromeContextMenuItem.OPEN_IN_INCOGNITO_TAB);
+         }
+ 
++        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)
++                && !mDelegate.isIncognito()) {
++            disabledOptions.add(ChromeContextMenuItem.OPEN_IN_NEW_TAB);
++        }
++
+         if (params.getLinkText().trim().isEmpty() || params.isImage()) {
+             disabledOptions.add(ChromeContextMenuItem.COPY_LINK_TEXT);
+         }
+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.tabmodel.TabModel.TabLaunchType;
+ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
+ import org.chromium.chrome.browser.util.IntentUtils;
+@@ -36,6 +39,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;
+@@ -47,6 +51,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+         mActivity = activity;
+         mNativeWindow = nativeWindow;
+         mIncognito = incognito;
++        if (!mIncognito) {
++            mExtraLogic = new AlwaysIncognitoLinkInterceptor(ContextUtils.getAppSharedPreferences());
++        } else {
++            mExtraLogic = null;
++        }
+     }
+ 
+     @Override
+@@ -159,6 +168,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+                         tab.getWebContents());
+             }
+ 
++            if (mExtraLogic != null) {
++                tab.addObserver(mExtraLogic);
++            }
++
+             mTabModel.addTab(tab, position, type);
+             return tab;
+         } finally {
+@@ -199,6 +212,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;
+     }
+@@ -242,7 +260,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
+@@ -302,6 +319,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
+@@ -615,6 +615,12 @@ CHAR-LIMIT guidelines:
+       <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Summary for reporting data to detect bad apps/sites.">
+         Automatically send some system information and page content to Google to help detect dangerous apps and sites
+       </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
+@@ -7,6 +7,7 @@ import("//components/offline_pages/buildflags/features.gni")
+ import("//device/vr/buildflags/buildflags.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/ActivityTabTaskDescriptionHelper.java",
+   "java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java",
+-- 
+2.7.4
+

patches/BRM083_kill-GCM.patch

@@ -413,7 +413,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In
 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
-@@ -24,7 +24,6 @@ chrome_java_sources = [
+@@ -25,7 +25,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 +421,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",
-@@ -1159,7 +1158,6 @@ chrome_java_sources = [
+@@ -1160,7 +1159,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",

patches/BRM085_kill-remaining-Play-Services-checks.patch

@@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen
 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
-@@ -540,10 +540,7 @@ chrome_java_sources = [
+@@ -541,10 +541,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java",
    "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java",
    "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java",