Release 65.0.3325.230

Updated CHANGELOG
Release 65.0.3325.218
2018-04-21 22:39:52 +02:00 · 2018-04-12 09:47:34 +02:00 · 2018-04-12 09:38:58 +02:00 · 2018-04-05 10:54:31 +02:00 · 2018-04-01 12:05:30 +02:00 · 2018-04-01 11:43:20 +02:00
14 changed files with 101645 additions and 63963 deletions
@@ -1,6 +1,25 @@
+# 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 of third-party filters
+* completed patches cleanup
+* updated AdBlock filters
+
 # 65.0.3325.190
 * block some Canvas and AudioBuffer APIs mostly used for fingerprinting
-* updated adblock filters
+* updated AdBlock filters

 # 65.0.3325.176
 * block plugins enumeration API
@@ -12,6 +12,11 @@ See [open issues](https://github.com/bromite/bromite/issues) for the development

 <img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" /> <img src="https://www.bromite.org/bromite_bromite_xda_downloads.svg" alt="downloads on XDA Labs" title="downloads on XDA Labs" />

+# Goals
+
+Bromite aims at providing a no-clutter browsing experience without privacy-invasive features and with the addition of a fast ad-blocking engine.
+Minimal UI changes are applied to help curbing the idea of "browser as an advertisement platform".
+
 # Donate

 Please donate to support development of Bromite and the costs for the build system.
@@ -30,10 +35,13 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 No.
 This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.

+## What is the SystemWebView?
+It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
+
 ## Does Bromite require root?
 No.

-## Q. Can you add dark mode/some cool themes?
+## Can you add dark mode/some cool themes?
 No.
 Bromite is about adblocking and privacy.

@@ -43,27 +51,30 @@ We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywh

 # Features

-* adblocking (currently baked-in, no configuration options available)
+* baked-in adblock engine with filters from EasyList, EasyPrivacy and others
 * remove click-tracking and AMP from Google search results
-* allow youtube/vimeo videos to play in background
+* allow videos to play in background
 * [StartPage](https://startpage.com/) search engine
 * [DuckDuckGo](https://duckduckgo.com/) search engine
 * [Qwant](https://www.qwant.com/) search engine
-* Google search engines English-only with reduced tracking
+* Google search engine English-only with reduced tracking
 * privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
-* removed webRTC and applied other anti-fingerprinting mitigations
+* webRTC, canvas, audio and other anti-fingerprinting mitigations
 * all codecs included (proprietary, open H.264 etc.)
 * built with official optimizations

 # Releases

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

 Each tag corresponds to a Chromium release tag.

+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
+Additionally, SystemWebView, Monochrome and the vanilla Chromium builds are provided.
+
 # How to build

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

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

@@ -74,7 +85,7 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [Iridium project](https://github.com/iridium-browser) for some patches (taken from above ungoogled-chromium)
 * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (taken from above ungoogled-chromium)
 * nochromo for the original adblock patch
-* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the compilation of original adblock patch
+* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the filters included

 # License

@@ -5,13 +5,13 @@ Subject: ungoogled-chromium: Disable untraceable URLs
 Disable additional URLs that are not caught by the "trk" scheme
 ---
 chrome/browser/android/rlz/rlz_ping_handler.cc           | 2 +-
- chrome/browser/plugins/plugins_resource_service.cc       | 2 +-
+ chrome/browser/plugins/plugins_resource_service.cc       | 5 +----
 chrome/browser/safe_browsing/client_side_model_loader.cc | 6 ++----
 chrome/browser/safe_browsing/client_side_model_loader.h  | 1 -
 rlz/lib/financial_ping.cc                                | 4 ++--
 rlz/lib/lib_values.cc                                    | 1 -
 rlz/lib/lib_values.h                                     | 1 -
- 7 files changed, 6 insertions(+), 11 deletions(-)
+ 7 files changed, 6 insertions(+), 14 deletions(-)

 diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
 --- a/chrome/browser/android/rlz/rlz_ping_handler.cc
@@ -28,7 +28,17 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and
 diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
 --- a/chrome/browser/plugins/plugins_resource_service.cc
 +++ b/chrome/browser/plugins/plugins_resource_service.cc
-@@ -68,7 +68,7 @@ GURL GetPluginsServerURL() {
+@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
+ // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
+ const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
+ 
+-const char kPluginsServerUrl[] =
+-    "https://www.gstatic.com/chrome/config/plugins_3/";
+-
+ GURL GetPluginsServerURL() {
+   std::string filename;
+ #if defined(OS_WIN)
+@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
 #error Unknown platform
 #endif
 
@@ -0,0 +1,189 @@
+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
+@@ -1739,6 +1739,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/url_request/network_error_logging_delegate.h"
+ #endif  // BUILDFLAG(ENABLE_REPORTING)
+@@ -581,6 +583,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
+
@@ -0,0 +1,584 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 28 Mar 2018 15:55:11 +0200
+Subject: Bromite adblock engine
+
+Ported from NoChromo patch
+Make interception testable
+Add domain support
+Re-land: third-party filters support
+---
+ net/BUILD.gn                          |   9 +-
+ net/url_request/adblock_intercept.cc  | 324 ++++++++++++++++++++++++++++++++++
+ net/url_request/adblock_intercept.h   |  16 ++
+ net/url_request/nochromo_intercept.cc | 116 ------------
+ net/url_request/nochromo_intercept.h  |  13 --
+ net/url_request/url_request.cc        |  19 +-
+ 6 files changed, 364 insertions(+), 133 deletions(-)
+ create mode 100644 net/url_request/adblock_intercept.cc
+ create mode 100644 net/url_request/adblock_intercept.h
+ delete mode 100644 net/url_request/nochromo_intercept.cc
+ delete mode 100644 net/url_request/nochromo_intercept.h
+
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
+++ b/net/BUILD.gn
+@@ -1739,8 +1739,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",
+@@ -1801,6 +1799,13 @@ component("net") {
+       "//third_party/zlib",
+     ]
+ 
+    if (is_android) {
+      sources += [
+        "url_request/adblock_intercept.cc",
+        "url_request/adblock_intercept.h"
+      ]
+    }
+
+     if (enable_reporting) {
+       sources += [
+         "network_error_logging/network_error_logging_service.cc",
+diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
+new file mode 100644
+--- /dev/null
+++ b/net/url_request/adblock_intercept.cc
+@@ -0,0 +1,324 @@
+#include "url/gurl.h"
+
+#ifdef ADB_TESTER
+#include <cstddef>
+#include <cstdlib>
+#include <string.h>
+
+#include "log.h"
+#include <tld.h>
+
+#else
+
+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include <android/log.h>
+
+#endif
+
+#include "net/url_request/adblock_entries.h"
+
+namespace net {
+
+const char *LOG_TAG = "Bromite";
+
+#ifdef ADB_TESTER
+int adblock_rules_count() { return ADBLOCK_ENTRY_COUNT; }
+#endif
+
+// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
+// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
+// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
+// string in |tld|, if specified and the |host| can be parsed.
+static bool is_first_party(char *l_host, char *l_url_host) {
+  size_t tld_length;
+
+#ifdef ADB_TESTER
+  char *found_tld;
+
+  if (TLD_SUCCESS != tld_get_z(l_host, &found_tld))
+    return false;
+  tld_length = strlen(found_tld);
+  if (tld_length == 0)
+    return false;
+#else
+  tld_length = net::registry_controlled_domains::GetCanonicalHostRegistryLength(
+      l_host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+  if ((tld_length == 0) || (tld_length == std::string::npos))
+    return false;
+#endif
+
+  int len = strlen(l_host);
+  char *tld = l_host + len - tld_length;
+
+  // Removes any subdomain from origin host.
+  int i = len - tld_length - 2, top_i = i;
+  if (i < 0) {
+    return false;
+  }
+  char *domain = l_host;
+  for (; i >= 0; i--) {
+    if (l_host[i] == '.') {
+      int p_len = top_i - i;
+      // skip "co" in "co.uk", "org" in "org.uk"
+      if (p_len <= 3) {
+        tld -= p_len + 1;
+        continue;
+      }
+
+      // segment is long enough, accept it at as a domain
+      domain = l_host + i;
+      len -= i;
+      break;
+    }
+  }
+
+#ifdef ADBLOCK_LOG
+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
+                      "%s: extracted domain suffix: \"%s\" (TLD=\"%s\")",
+                      l_host, domain, tld);
+#endif
+
+  // Check if supplied URL host matches, including the dot.
+  int b_len = strlen(l_url_host);
+  if (b_len < len) {
+    return false;
+  }
+  for (int i = 0; i < len; i++) {
+    if (l_url_host[b_len - 1 - i] != domain[len - 1 - i])
+      return false;
+  }
+
+  // pass with flying colors
+  return true;
+}
+
+static char *strtolower(const char *str) {
+  int len = strlen(str);
+  char *ret = (char *)malloc(len + 1);
+  ret[len] = '\0';
+  for (int i = 0; i < len; i++) {
+    if ((65 <= str[i]) && (str[i] <= 90)) {
+      ret[i] = str[i] + 32;
+    } else {
+      ret[i] = str[i];
+    }
+  }
+  return ret;
+}
+
+static char *strtosep(const char *str) {
+  int len = strlen(str);
+  char *ret = (char *)malloc(len + 3);
+  ret[0] = '^';
+  ret[len + 1] = '^';
+  ret[len + 2] = '\0';
+  for (int i = 0; i < len; i++) {
+    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') ||
+        (str[i] == '&') || (str[i] == '=')) {
+      ret[i + 1] = '^';
+    } else {
+      ret[i + 1] = str[i];
+    }
+  }
+  return ret;
+}
+
+static bool url_matches(const char *c_url, char *c_url_sep, char *c_url_lower,
+                        char *c_url_lower_sep, adblock_entry *entry) {
+  bool match = false;
+  // select comparison string based on case and separator presence (separator
+  // takes some shortcuts)
+  bool match_case = ((entry->flags & ADBLOCK_FLAG_MATCH_CASE) != 0);
+  bool match_separator = ((entry->flags & ADBLOCK_FLAG_HAS_SEPARATOR) != 0);
+  const char *match_url =
+      match_case ? (match_separator ? c_url_sep : c_url)
+                 : (match_separator ? c_url_lower_sep : c_url_lower);
+
+#ifdef ADBLOCK_LOG_MORE
+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[case:%d][sep:%d][%s]",
+                      match_case, match_separator, match_url);
+#endif
+  // check for all match parts at >= position of last match
+  const char *last = match_url;
+  for (int m = 0; const char *url_match = entry->matches[m]; m++) {
+    bool is_last_match = entry->matches[m + 1] == NULL;
+    const char *pos = strstr(last, url_match);
+    match = (pos != NULL);
+
+#ifdef ADBLOCK_LOG_MORE
+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s][found:%d][match:%d]",
+                        entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
+#endif
+    // check if the url starts with the first match part
+    if (match && (m == 0) && ((entry->flags & ADBLOCK_FLAG_MATCH_BEGIN) != 0) &&
+        (pos != match_url))
+      match = false;
+
+    // check if the url ends with the last match part
+    if (match && is_last_match &&
+        ((entry->flags & ADBLOCK_FLAG_MATCH_END) != 0) &&
+        (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])]))
+      match = false;
+
+    // check domain match
+    if (match && (m == 0) &&
+        ((entry->flags & ADBLOCK_FLAG_MATCH_DOMAIN) != 0) &&
+        (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') &&
+        (pos[-1] != '/'))
+      match = false;
+
+    // short circuit
+    if (!match)
+      break;
+  }
+  return match;
+}
+
+bool url_match_domain(adblock_entry *entry, const std::string &origin_host) {
+  bool match_domain = true;
+  // check for a negative domain match
+  if (entry->domains_neg) {
+    if (origin_host.empty()) {
+      // skip this rule, cannot match on domain
+      return false;
+    }
+    for (int d = 0; const char *domain = entry->domains_neg[d]; d++) {
+      if (domain == origin_host) {
+        match_domain = false;
+        break;
+      }
+    }
+  }
+
+  // check for a required positive domain match
+  if (entry->domains) {
+    if (origin_host.empty()) {
+      // skip this rule, cannot match on domain
+      return false;
+    }
+    for (int d = 0; const char *domain = entry->domains[d]; d++) {
+      if (domain != origin_host) {
+        match_domain = false;
+        break;
+      }
+    }
+  }
+  return match_domain;
+}
+
+static bool url_match_party(adblock_entry *entry, const GURL &url,
+                            const std::string &origin_host, bool &checked_fp,
+                            bool &fp) {
+  bool wanted_fp;
+  if ((entry->flags & ADBLOCK_FLAG_THIRD_PARTY) != 0) {
+    wanted_fp = false;
+  } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) {
+    wanted_fp = true;
+  } else {
+    // no-op
+    return true;
+  }
+
+  if (origin_host.empty()) {
+    // cannot match this rule, no origin host to determine first/third party
+    return false;
+  }
+
+#ifdef ADB_TESTER
+//__android_log_print(ANDROID_LOG_INFO, LOG_TAG, "matchFirst=%d matchThird=%d",
+// matchFirstParty, matchThirdParty);
+#endif
+  if (!checked_fp) {
+    // lower-case version
+    char *l_host = strtolower(origin_host.c_str()),
+         *l_url_host = strtolower(url.host().c_str());
+
+    // is the URL a first-party to the current page's host?
+    fp = is_first_party(l_host, l_url_host);
+
+    checked_fp = true;
+#ifdef ADB_TESTER
+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
+                        "is_first_party(\"%s\", \"%s\") = %s", l_host,
+                        l_url_host, fp ? "true" : "false");
+#endif
+    free(l_host);
+    free(l_url_host);
+  }
+
+  return fp == wanted_fp;
+}
+
+int adblock_intercept(const GURL &url, const std::string &origin_host) {
+  //  if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS()) {
+  //     return 0;
+  //  }
+
+  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
+    const char *c_url = url.spec().c_str();
+    char *c_url_lower = strtolower(c_url);
+    char *c_url_sep = strtosep(c_url);
+    char *c_url_lower_sep = strtosep(c_url_lower);
+
+#ifdef ADBLOCK_LOG
+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s with host '%s'] [%s]",
+                        c_url, url.host().c_str(), origin_host.c_str());
+#endif
+
+    bool checked_fp = false, fp = false;
+
+    bool intercept = false;
+    for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) {
+      adblock_entry *entry = &ADBLOCK_ENTRIES[i];
+
+      // no use checking rules when we're intercepting, or exceptions when not
+      bool check =
+          (!intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) == 0)) ||
+          (intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) != 0));
+      if (!check)
+        continue;
+
+      // first check for domain matches, a quick branch out if matching
+      if (!url_match_domain(entry, origin_host))
+        continue;
+
+      // check on the URL matcher
+      if (!url_matches(c_url, c_url_sep, c_url_lower, c_url_lower_sep, entry))
+        continue;
+
+      // finally check first/third-party
+      if (!url_match_party(entry, url, origin_host, checked_fp, fp))
+        continue;
+
+#ifdef ADBLOCK_LOG
+      if (!intercept) {
+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
+                            "--> intercept (#%d: \"%s\") (%x)", i,
+                            entry->matches[0], entry->flags);
+      } else {
+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "--> pass (%d) (#%d)", i,
+                            entry->flags);
+      }
+#endif
+      intercept = !intercept;
+    } // for each entry
+
+    free(c_url_sep);
+    free(c_url_lower);
+    free(c_url_lower_sep);
+
+    if (intercept) {
+#ifdef ADBLOCK_LOG
+      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked");
+#endif
+      return 1;
+    }
+#ifdef ADBLOCK_LOG
+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass");
+#endif
+  }
+  return 0;
+}
+
+} // namespace net
+diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
+new file mode 100644
+--- /dev/null
+++ b/net/url_request/adblock_intercept.h
+@@ -0,0 +1,16 @@
+#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
+#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
+
+#include "url/gurl.h"
+
+namespace net {
+
+#ifdef ADB_TESTER
+int adblock_rules_count();
+#endif
+
+int adblock_intercept(const GURL &url, const std::string &origin_host);
+
+} // namespace net
+
+#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
+diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
+deleted file mode 100644
+--- a/net/url_request/nochromo_intercept.cc
+++ /dev/null
+@@ -1,116 +0,0 @@
+-#include "url/gurl.h"
+-#include "net/url_request/nochromo_entries.h"
+-
+-#include <android/log.h>
+-
+-namespace net {
+-  
+-#define NOCHROMO_LOG 0
+-#define NOCHROMO_LOG_MORE 0
+-
+-static char* strtolower(const char* str) {
+-  int len = strlen(str);
+-  char* ret = (char*)malloc(len + 1);
+-  ret[len] = '\0';
+-  for (int i = 0; i < len; i++) {
+-    if ((65 <= str[i]) && (str[i] <= 90)) {
+-      ret[i] = str[i] + 32;
+-    } else {
+-      ret[i] = str[i];
+-    }
+-  }
+-  return ret;
+-}
+-
+-static char* strtosep(const char* str) {
+-  int len = strlen(str);
+-  char* ret = (char*)malloc(len + 3);
+-  ret[0] = '^';
+-  ret[len + 1] = '^';
+-  ret[len + 2] = '\0';
+-  for (int i = 0; i < len; i++) {
+-    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
+-      ret[i + 1] = '^';
+-    } else {
+-      ret[i + 1] = str[i];
+-    }
+-  }
+-  return ret;
+-}
+-
+-int nochromo_intercept(const GURL& url) {
+-  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
+-    const char* c_url = url.spec().c_str();
+-    char* c_url_lower = strtolower(c_url);
+-    char* c_url_sep = strtosep(c_url);
+-    char* c_url_lower_sep = strtosep(c_url_lower);
+-    
+-    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
+-    
+-    bool intercept = false;
+-    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
+-      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
+-      
+-      // no use checking rules when we're intercepting, or exceptions when not
+-      bool check =
+-        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
+-        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
+-      
+-      if (check) {
+-        bool match = false;
+-        
+-        // select comparison string based on case and separator presence (separator takes some shortcuts)
+-        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
+-        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
+-        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
+-        
+-        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
+-        
+-        // check for all match parts at >= position of last match
+-        const char* last = match_url;
+-        for (int m = 0; m < entry->matchcount; m++) {
+-          const char* pos = strstr(last, entry->matches[m]);
+-          match = (pos != NULL);
+-          
+-          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
+-          
+-          // check if the url starts with the first match part
+-          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
+-          
+-          // check if the url ends with the last match part
+-          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
+-          
+-          // check domain match
+-          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
+-          
+-          // short circuit
+-          if (!match) break;
+-        }
+-        
+-        if (match) {
+-          if (NOCHROMO_LOG) {
+-            if (!intercept) {
+-              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
+-            } else {
+-              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
+-            }
+-          }
+-          intercept = !intercept;
+-        }
+-      }
+-    }
+-    
+-    free(c_url_sep);
+-    free(c_url_lower);
+-    free(c_url_lower_sep);
+-    
+-    if (intercept) {
+-      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
+-      return 1;
+-    }
+-    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
+-  }
+-  return 0;
+-}
+-
+-}  // namespace net
+\ No newline at end of file
+diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
+deleted file mode 100644
+--- a/net/url_request/nochromo_intercept.h
+++ /dev/null
+@@ -1,13 +0,0 @@
+-#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+-#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+-
+-#include "url/gurl.h"
+-
+-namespace net {
+-
+-GURL nochromo_intercepted = GURL("http://127.0.0.1/");
+-int nochromo_intercept(const GURL& url);
+-
+-}  // namespace net
+-
+-#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
+--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
+@@ -44,7 +44,9 @@
+ #include "url/gurl.h"
+ #include "url/origin.h"
+ 
+-#include "net/url_request/nochromo_intercept.h"
+#if defined(OS_ANDROID)
+#include "net/url_request/adblock_intercept.h"
+#endif
+ 
+ #if BUILDFLAG(ENABLE_REPORTING)
+ #include "net/url_request/network_error_logging_delegate.h"
+@@ -558,7 +560,9 @@ URLRequest::URLRequest(const GURL& url,
+                                          : context->network_delegate()),
+       net_log_(NetLogWithSource::Make(context->net_log(),
+                                       NetLogSourceType::URL_REQUEST)),
+#if !defined(OS_ANDROID)
+       url_chain_(1, url),
+#endif
+       method_("GET"),
+       referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
+       first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL),
+@@ -583,7 +587,18 @@ URLRequest::URLRequest(const GURL& url,
+   // Sanity check out environment.
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
+-  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
+#if defined(OS_ANDROID)
+  std::string initiatorHost;
+  if (initiator_.has_value()) {
+    initiatorHost = initiator_.value().host();
+  }
+
+  if (adblock_intercept(url, initiatorHost)) {
+     url_chain_ = { url, GURL("http://127.0.0.1") };
+  } else {
+     url_chain_ = { url };
+  }
+#endif
+ 
+   context->url_requests()->insert(this);
+   net_log_.BeginEvent(
+-- 
+2.7.4
+
@@ -3,9 +3,22 @@ Date: Thu, 22 Mar 2018 22:11:57 +0100
 Subject: Battery API: return nothing

 ---
+ services/device/battery/battery_status_service.cc  |  2 +-
 .../Source/modules/battery/BatteryManager.cpp      | 25 ++++------------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
+ 2 files changed, 5 insertions(+), 22 deletions(-)

+diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
+--- a/services/device/battery/battery_status_service.cc
+++ b/services/device/battery/battery_status_service.cc
+@@ -41,7 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+   if (!battery_fetcher_)
+     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
+ 
+-#if 0
+#if !defined(OS_ANDROID)
+   if (callback_list_.empty()) {
+     bool success = battery_fetcher_->StartListeningBatteryChange();
+     // On failure pass the default values back.
 diff --git a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
 --- a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
 +++ b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
@@ -2,10 +2,12 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sun, 25 Mar 2018 21:49:37 +0200
 Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL

+Return fixed base latency
 ---
 third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl | 8 ++++----
 third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl  | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ third_party/WebKit/Source/modules/webaudio/AudioContext.cpp | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)

 diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
 --- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
@@ -38,6 +40,18 @@ diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_
 +    //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
 };
+diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
+--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
+@@ -268,7 +268,7 @@ void AudioContext::StopRendering() {
+ }
+ 
+ double AudioContext::baseLatency() const {
+-  return FramesPerBuffer() / static_cast<double>(sampleRate());
+  return 0.04;
+ }
+ 
+ // TODO(crbug.com/764396): Remove these when fixed.
 -- 
 2.7.4

@@ -0,0 +1,130 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 30 Mar 2018 10:09:03 +0200
+Subject: Add fingerprinting mitigation for getClientRects,
+ getBoundingClientRect
+
+Scale the result of Range::getClientRects and Element::getBoundingClientRect
+by a random +/-5% of the original value for each float in the Rect/Quad.
+The random value is generated once for each Document and re-used for all the
+attached elements.
+The rationale is that such value, albeit constant within the rendered Document,
+is within the same order of magniture of the floating point precision being
+used for fingerprinting and sufficient to poison the well.
+
+See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
+---
+ third_party/WebKit/Source/core/dom/Document.cpp | 14 ++++++++++++++
+ third_party/WebKit/Source/core/dom/Document.h   |  5 +++++
+ third_party/WebKit/Source/core/dom/Element.cpp  |  7 +++++++
+ third_party/WebKit/Source/core/dom/Range.cpp    |  8 +++++++-
+ 4 files changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
+--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
+@@ -271,6 +271,8 @@
+ #include "services/service_manager/public/cpp/interface_provider.h"
+ #include "third_party/WebKit/common/page/page_visibility_state.mojom-blink.h"
+ 
+#include "base/rand_util.h"
+
+ #ifndef NDEBUG
+ using WeakDocumentSet =
+     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
+@@ -730,6 +732,10 @@ Document::Document(const DocumentInit& initializer,
+ #ifndef NDEBUG
+   liveDocumentSet().insert(this);
+ #endif
+
+  // add ±5% noise against fingerprinting
+  shuffleFactorX_ = 1 + (base::RandDouble() - 0.5) * 0.05;
+  shuffleFactorY_ = 1 + (base::RandDouble() - 0.5) * 0.05;
+ }
+ 
+ Document::~Document() {
+@@ -756,6 +762,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
+                        Position::BeforeNode(*shadow_host));
+ }
+ 
+double Document::GetShuffleFactorX() {
+	return shuffleFactorX_;
+}
+
+double Document::GetShuffleFactorY() {
+	return shuffleFactorY_;
+}
+
+ SelectorQueryCache& Document::GetSelectorQueryCache() {
+   if (!selector_query_cache_)
+     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
+diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h
+--- a/third_party/WebKit/Source/core/dom/Document.h
+++ b/third_party/WebKit/Source/core/dom/Document.h
+@@ -407,6 +407,9 @@ class CORE_EXPORT Document : public ContainerNode,
+   String origin() const;
+   String suborigin() const;
+ 
+  double GetShuffleFactorX();
+  double GetShuffleFactorY();
+
+   String visibilityState() const;
+   mojom::PageVisibilityState GetPageVisibilityState() const;
+   bool hidden() const;
+@@ -1671,6 +1674,8 @@ class CORE_EXPORT Document : public ContainerNode,
+ 
+   double start_time_;
+ 
+  double shuffleFactorX_, shuffleFactorY_;
+
+   TraceWrapperMember<ScriptRunner> script_runner_;
+ 
+   HeapVector<Member<ScriptElementBase>> current_script_stack_;
+diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
+--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
+@@ -1227,6 +1227,11 @@ DOMRectList* Element::getClientRects() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
+       quads, *element_layout_object);
+
+  for (FloatQuad& quad : quads) {
+    quad.Scale(GetDocument().GetShuffleFactorX(), GetDocument().GetShuffleFactorY());
+  }
+
+   return DOMRectList::Create(quads);
+ }
+ 
+@@ -1244,6 +1249,8 @@ DOMRect* Element::getBoundingClientRect() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
+                                                         *element_layout_object);
+  result.Scale(GetDocument().GetShuffleFactorX(), GetDocument().GetShuffleFactorY());
+
+   return DOMRect::FromFloatRect(result);
+ }
+ 
+diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp
+--- a/third_party/WebKit/Source/core/dom/Range.cpp
+++ b/third_party/WebKit/Source/core/dom/Range.cpp
+@@ -1589,11 +1589,17 @@ DOMRectList* Range::getClientRects() const {
+   Vector<FloatQuad> quads;
+   GetBorderAndTextQuads(quads);
+ 
+  for (FloatQuad& quad : quads) {
+    quad.Scale(owner_document_->GetShuffleFactorX(), owner_document_->GetShuffleFactorY());
+  }
+
+   return DOMRectList::Create(quads);
+ }
+ 
+ DOMRect* Range::getBoundingClientRect() const {
+-  return DOMRect::FromFloatRect(BoundingRect());
+  auto rect = BoundingRect();
+  rect.Scale(owner_document_->GetShuffleFactorX(), owner_document_->GetShuffleFactorY());
+  return DOMRect::FromFloatRect(rect);
+ }
+ 
+ // TODO(editing-dev): We should make
+-- 
+2.7.4
+
@@ -0,0 +1,181 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 18 Oct 2017 21:26:53 +0200
+Subject: Add menu option to toggle global Javascript preference
+
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  | 13 ++++++++
+ chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
+ .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 35 ++++++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
+ .../java/strings/android_chrome_strings.grd        | 11 +++++++
+ 7 files changed, 89 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -49,6 +49,19 @@
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk"
+             android:orderInCategory="2" />
+
+        <item android:id="@+id/enable_javascript_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_javascript_id"
+                  android:title="@string/menu_enable_javascript" />
+              <item android:id="@+id/enable_javascript_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+             android:title="@null"
+             android:orderInCategory="2">
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -59,6 +59,19 @@
+             android:title="@string/menu_add_to_homescreen" />
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk" />
+
+        <item android:id="@+id/enable_javascript_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_javascript_id"
+                  android:title="@string/menu_enable_javascript" />
+              <item android:id="@+id/enable_javascript_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+             android:title="@null">
+           <menu>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -1969,6 +1969,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
+             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
+             RecordUserAction.record("MobileMenuRequestDesktopSite");
+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
+            if (reloadOnChange) {
+				currentTab.reload();
+			}
+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.reader_mode_prefs_id) {
+             if (currentTab.getWebContents() != null) {
+                 RecordUserAction.record("DomDistiller_DistilledPagePrefsOpened");
+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
+@@ -1895,6 +1895,14 @@ public class ChromeTabbedActivity
+                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
+             }
+             RecordUserAction.record("MobileMenuDownloadManager");
+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
+            if (reloadOnChange) {
+				currentTab.reload();
+			}
+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.open_recently_closed_tab) {
+             TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
+             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+@@ -225,6 +225,8 @@ public class AppMenuPropertiesDelegate {
+ 
+             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+ 
+            updateEnableJavascriptMenuItem(menu, currentTab);
+
+             // Only display reader mode settings menu option if the current page is in reader mode.
+             menu.findItem(R.id.reader_mode_prefs_id)
+                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
+@@ -504,4 +506,37 @@ public class AppMenuPropertiesDelegate {
+ 
+         return chromeHomeMenuItemFlagEnabled && !sHideChromeHomeMenuItems;
+     }
+
+    /**
+     * Updates the enable JavaScript item's state.
+     *
+     * @param menu {@link Menu} for enable javascript
+     * @param currentTab      Current tab being displayed.
+     */
+    protected void updateEnableJavascriptMenuItem(
+            Menu menu, Tab currentTab) {
+        MenuItem enableMenuRow = menu.findItem(R.id.enable_javascript_row_menu_id);
+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_javascript_id);
+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_javascript_check_id);
+
+        // Hide enable javascript on all chrome:// pages and the NTP.
+        String url = currentTab.getUrl();
+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+
+        boolean itemVisible = !isChromeScheme && !currentTab.isNativePage();
+        enableMenuRow.setVisible(itemVisible);
+        if (!itemVisible) return;
+
+        boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
+
+        // Mark the checkbox if Javascript is activated on this tab.
+        enableMenuCheck.setChecked(jsEnabled);
+
+        // This title doesn't seem to be displayed by Android, but it is used to set up
+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
+        enableMenuLabel.setTitleCondensed(jsEnabled
+                        ? mActivity.getString(R.string.menu_enable_javascript_on)
+                        : mActivity.getString(R.string.menu_enable_javascript_off));
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -164,6 +164,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             }
+ 
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+            updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+         }
+     }
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -2506,6 +2506,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
+         Find in page
+       </message>
+
+      <message name="IDS_MENU_ENABLE_JAVASCRIPT" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable JavaScript support for the page. [CHAR-LIMIT=27]">
+        Enable JavaScript
+      </message>
+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_ON" desc="Accessibility description for when Enable JavaScript is selected.">
+        Turn off JavaScript
+      </message>
+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_OFF" desc="Accessibility description for when Enable JavaScript is unselected.">
+        Turn on JavaScript
+      </message>
+
+       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Chrome's overflow/options menu. By default, when a user navigates to a web page, Chrome shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Chrome will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
+         Desktop site
+       </message>
+-- 
+2.7.4
+
Author	SHA1	Message	Date
csagan5	01ad976b53	Release 65.0.3325.230	2018-04-21 22:39:52 +02:00
csagan5	38a672a1ca	Updated CHANGELOG	2018-04-12 09:47:34 +02:00
csagan5	a723e0e77d	Release 65.0.3325.218	2018-04-12 09:38:58 +02:00
CarlandGitHub	3abb1ad2a3	Mention anti-fingerprinting mitigations	2018-04-05 10:54:31 +02:00
csagan5	d7e8ac9d86	Add latest AdBlock filters	2018-04-01 12:05:30 +02:00
csagan5	284c419d01	Release 65.0.3325.204	2018-04-01 11:43:20 +02:00
csagan5	2dca759091	Publish patches for next release	2018-04-01 11:29:50 +02:00
csagan5	11cebfadc5	Release 65.0.3325.198	2018-03-29 09:20:10 +02:00
csagan5	e4e56ed69c	Updated README, added Goals	2018-03-28 18:12:04 +02:00
CarlandGitHub	7dcc27cb5e	Mention SystemWebView	2018-03-28 01:43:32 +02:00