Release 71.0.3578.98

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 71.0.3578.98
+* do not ask permissions for camera when importing bookmarks (fixes https://github.com/bromite/bromite/issues/200)
+
+# 71.0.3578.88
+* add proxy configuration page (see https://github.com/bromite/bromite/wiki/ProxyConfiguration)
+* use more recent versions in User-Agent (fixes https://github.com/bromite/bromite/issues/156)
+
+# 71.0.3578.85
+* fix blurry adaptive icon (fixes https://github.com/bromite/bromite/issues/197)
+
 # 71.0.3578.76
 
 # 71.0.3578.72

README.md

@@ -76,6 +76,7 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
 * 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 and Quad9 servers
+* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
 * chrome flags to disable custom intents and clear session on exit
 * always-incognito mode

patches/BRM010_Modify-default-preferences.patch

@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1055,7 +1055,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1053,7 +1053,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

patches/BRM028_ungoogled-chromium-Disable-profile-avatar-downloading.patch

@@ -12,7 +12,7 @@ Added some Bromite-specific further improvements
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1268,8 +1268,6 @@ jumbo_split_static_library("browser") {
+@@ -1270,8 +1270,6 @@ jumbo_split_static_library("browser") {
      "profiles/profile_attributes_entry.h",
      "profiles/profile_attributes_storage.cc",
      "profiles/profile_attributes_storage.h",

patches/BRM052_Bromite-adblock-engine.patch

@@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook
  .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
  .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
  .../java/strings/android_chrome_strings.grd        |  11 +
- chrome/browser/net/chrome_network_delegate.cc      |  83 ++++--
+ chrome/browser/net/chrome_network_delegate.cc      |  83 +++--
  .../subresource_filter_content_settings_manager.cc |   1 +
  net/BUILD.gn                                       |   7 +
- net/url_request/adblock_intercept.cc               | 325 +++++++++++++++++++++
- net/url_request/adblock_intercept.h                |  24 ++
- 12 files changed, 510 insertions(+), 20 deletions(-)
+ net/url_request/adblock_intercept.cc               | 341 +++++++++++++++++++++
+ net/url_request/adblock_intercept.h                |  41 +++
+ 12 files changed, 543 insertions(+), 20 deletions(-)
  create mode 100644 net/url_request/adblock_intercept.cc
  create mode 100644 net/url_request/adblock_intercept.h
 
@@ -341,7 +341,23 @@ 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,325 @@
+@@ -0,0 +1,341 @@
++/*
++    This file is part of Bromite.
++
++    Bromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Bromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
++*/
 +#include "url/gurl.h"
 +
 +#ifdef ADB_TESTER
@@ -671,7 +687,24 @@ 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,24 @@
+@@ -0,0 +1,41 @@
++/*
++    This file is part of Bromite.
++
++    Bromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Bromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
 +#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +

patches/BRM053_User-Agent-anonymize.patch

@@ -2,16 +2,17 @@ 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.
+Use a fixed device name and Chrome product version with the goal of not
+disclosing the specific build of Bromite.
 ---
- components/version_info/version_info.cc | 17 +++++++-
- content/common/user_agent.cc            | 73 +++++++++++++++++++++------------
- 2 files changed, 62 insertions(+), 28 deletions(-)
+ components/version_info/version_info.cc | 13 +++++-
+ content/common/user_agent.cc            | 72 ++++++++++++++++++++-------------
+ 2 files changed, 57 insertions(+), 28 deletions(-)
 
 diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
 --- a/components/version_info/version_info.cc
 +++ b/components/version_info/version_info.cc
-@@ -7,13 +7,28 @@
+@@ -7,13 +7,24 @@
  #include "base/logging.h"
  #include "base/no_destructor.h"
  #include "base/version.h"
@@ -28,16 +29,12 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v
 +                                               &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";
++      return "Chrome/69.0.3497.100";
 +  }
-+  // version 8 and above
-+  return "Chrome/67.0.3396.87";
++
++  // version 5 and above
++  return "Chrome/70.0.3538.80";
  }
  
  std::string GetProductName() {
@@ -56,7 +53,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
  std::string GetWebKitVersion() {
    return base::StringPrintf("%d.%d (%s)",
                              WEBKIT_VERSION_MAJOR,
-@@ -66,7 +61,33 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+@@ -66,7 +61,32 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
    }
  #elif defined(OS_ANDROID)
    std::string android_version_str = base::SysInfo::OperatingSystemVersion();
@@ -66,24 +63,23 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 +  // Send information about the device and build ID.
 +  // Use a common device/build ID based on Android major version.
 +  switch (os_major_version) {
++    default: // version 9 and above
++      android_info_str = "ONEPLUS A6000";
++      break;
++    case 8:
++      android_info_str = "FIG-LX3";
++      break;
 +    case 7:
-+      // Chrome/63.0.3239.111
-+      android_info_str = "SM-J730GM Build/NRD90M";
++      android_info_str = "SM-G610M";
 +      break;
 +    case 6:
-+      // Chrome/63.0.3239.83
-+      android_info_str = "SM-G532G Build/MMB29T";
++      android_info_str = "SM-J700M";
 +      break;
 +    case 5:
-+      // Chrome/62.0.3202.84
-+      android_info_str = "A37fw Build/LMY47V";
++      android_info_str = "XT1033";
 +      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";
++      android_info_str = "ZTE Blade C370 Build/KOT49H";
 +      break;
 +  }
 +
@@ -91,7 +87,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
  #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
    // Should work on any Posix system.
    struct utsname unixinfo;
-@@ -102,7 +123,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+@@ -102,7 +122,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
        os_minor_version,
        os_bugfix_version
  #elif defined(OS_ANDROID)
@@ -100,7 +96,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
        android_version_str.c_str(),
        android_info_str.c_str()
  #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
-@@ -137,18 +158,6 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
+@@ -137,18 +157,6 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
    return BuildUserAgentFromOSAndProduct(os_info, product);
  }
  
@@ -119,7 +115,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
  std::string GetAndroidOSInfo(bool include_android_build_number) {
    std::string android_info_str;
  
-@@ -162,18 +171,28 @@ std::string GetAndroidOSInfo(bool include_android_build_number) {
+@@ -162,18 +170,28 @@ std::string GetAndroidOSInfo(bool include_android_build_number) {
    }
  
    // Append the build ID.

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

@@ -358,7 +358,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
      "bookmarks/bookmark_stats.cc",
-@@ -2586,8 +2590,6 @@ jumbo_split_static_library("browser") {
+@@ -2588,8 +2592,6 @@ jumbo_split_static_library("browser") {
        "banners/app_banner_infobar_delegate_desktop.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
@@ -367,7 +367,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "certificate_viewer.h",
        "chrome_browser_field_trials_desktop.cc",
        "chrome_browser_field_trials_desktop.h",
-@@ -2678,8 +2680,6 @@ jumbo_split_static_library("browser") {
+@@ -2680,8 +2682,6 @@ jumbo_split_static_library("browser") {
        "importer/importer_uma.h",
        "importer/in_process_importer_bridge.cc",
        "importer/in_process_importer_bridge.h",

patches/BRM084_ungoogled-chromium-disable-safe-browsing.patch

@@ -41,7 +41,7 @@ Subject: ungoogled-chromium: disable safe browsing
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2619,8 +2619,6 @@ jumbo_split_static_library("browser") {
+@@ -2621,8 +2621,6 @@ jumbo_split_static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
  // NOT THREAD SAFE, call only from the main thread.
  // These functions shouldn't return NULL unless otherwise noted.
  class BrowserProcess {
-@@ -237,14 +229,6 @@ class BrowserProcess {
+@@ -234,14 +226,6 @@ class BrowserProcess {
    // on this platform (or this is a unit test).
    virtual StatusTray* status_tray() = 0;
  
@@ -110,7 +110,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
    network_time_tracker_.reset();
  #if BUILDFLAG(ENABLE_PLUGINS)
    plugins_resource_service_.reset();
-@@ -999,22 +996,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
+@@ -994,22 +991,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
    return status_tray_.get();
  }
  
@@ -133,7 +133,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
  subresource_filter::ContentRulesetService*
  BrowserProcessImpl::subresource_filter_ruleset_service() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1299,16 +1280,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
+@@ -1300,16 +1281,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
  #endif
  }
  
@@ -153,7 +153,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -176,9 +176,6 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -175,9 +175,6 @@ class BrowserProcessImpl : public BrowserProcess,
    void set_background_mode_manager_for_test(
        std::unique_ptr<BackgroundModeManager> manager) override;
    StatusTray* status_tray() override;
@@ -163,7 +163,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
    subresource_filter::ContentRulesetService*
    subresource_filter_ruleset_service() override;
    optimization_guide::OptimizationGuideService* optimization_guide_service()
-@@ -322,9 +319,6 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -324,9 +321,6 @@ class BrowserProcessImpl : public BrowserProcess,
    std::unique_ptr<BackgroundModeManager> background_mode_manager_;
  #endif
  
@@ -246,7 +246,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if defined(OS_ANDROID)
  float GetDeviceScaleAdjustment() {
    static const float kMinFSM = 1.05f;
-@@ -1997,7 +1973,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -1988,7 +1964,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
        // Disable client-side phishing detection in the renderer if it is
        // disabled in the Profile preferences or the browser process.
        if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -255,7 +255,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
          command_line->AppendSwitch(
              switches::kDisableClientSidePhishingDetection);
        }
-@@ -2675,7 +2651,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
+@@ -2666,7 +2642,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
    SSLErrorHandler::HandleSSLError(
        web_contents, cert_error, ssl_info, request_url,
        expired_previous_decision,
@@ -264,7 +264,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
        callback, SSLErrorHandler::BlockingPageReadyCallback());
  }
  
-@@ -2945,8 +2921,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
+@@ -2936,8 +2912,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
  void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  
@@ -273,7 +273,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
    for (size_t i = 0; i < extra_parts_.size(); ++i)
      extra_parts_[i]->ResourceDispatcherHostCreated();
  
-@@ -4112,7 +4086,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4103,7 +4077,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
    if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
      throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
          handle,

patches/BRM085_Allow-building-without-safebrowsing-for-Android.patch

@@ -165,7 +165,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -4862,19 +4862,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+@@ -4853,19 +4853,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
      content::ResourceContext* resource_context) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);