Release 83.0.4103.93

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 83.0.4103.93
+* fix undesired replacement for search engines (fixes https://github.com/bromite/bromite/issues/595)
+* fix resume flag not visible
+
 # 83.0.4103.76
 * fixed inverted Omnibox flag
 * fixed LocationBarPhone/LocationBarTablet crash (fixes https://github.com/bromite/bromite/issues/565)

build/RELEASE

@@ -1 +1 @@
-83.0.4103.76
+83.0.4103.93

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

@@ -139,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
  import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegateImpl;
-@@ -1478,6 +1479,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1479,6 +1480,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }

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

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -1960,6 +1960,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1961,6 +1961,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              AddToHomescreenCoordinator.showForAppMenu(
                      this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents());
              RecordUserAction.record("MobileMenuAddToHomescreen");

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

@@ -13,17 +13,17 @@ Disable it by default on Android as it is everywhere else
 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
-@@ -1925,6 +1925,10 @@ const FeatureEntry kFeatureEntries[] = {
- #if defined(USE_AURA)
-     {"overlay-scrollbars", flag_descriptions::kOverlayScrollbarsName,
-      flag_descriptions::kOverlayScrollbarsDescription,
+@@ -1939,6 +1939,10 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsAura,
+      FEATURE_VALUE_TYPE(features::kOverlayScrollbarFlashWhenMouseEnter)},
+ #endif  // USE_AURA
 +    {"resume-background-video",
 +     flag_descriptions::kResumeBackgroundVideoName,
 +     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
-      // Uses the system preference on Mac (a different implementation).
-      // On Android, this is always enabled.
-      kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbar)},
+     {"enable-quic", flag_descriptions::kQuicName,
+      flag_descriptions::kQuicDescription, kOsAll,
+      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)},
 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

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

@@ -83,7 +83,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -781,6 +781,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend",
+@@ -785,6 +785,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend",
  // TODO(rouslan): Remove this.
  const base::Feature kWebPayments{"WebPayments",
                                   base::FEATURE_ENABLED_BY_DEFAULT};
@@ -103,7 +103,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -171,6 +171,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
+@@ -172,6 +172,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
  CONTENT_EXPORT extern const base::Feature kWebXrIncubations;
  CONTENT_EXPORT extern const base::Feature kWebXrPermissionsApi;
  

build/patches/Automated-domain-substitution.patch

@@ -16,8 +16,6 @@ Subject: Automated domain substitution
  .../assistant_interaction_controller.cc       |    4 +-
  ash/assistant/assistant_setup_controller.cc   |    2 +-
  ash/assistant/util/deep_link_util.cc          |   16 +-
- ash/login/ui/login_auth_user_view.cc          |    4 +-
- ash/login/ui/login_test_base.cc               |    2 +-
  ash/login/ui/login_user_menu_view.cc          |    2 +-
  ash/public/cpp/app_list/app_list_features.cc  |    2 +-
  ash/resources/PRESUBMIT.py                    |    4 +-
@@ -907,7 +905,6 @@ Subject: Automated domain substitution
  .../core/realtime/url_lookup_service.cc       |    2 +-
  .../safe_search_url_checker_client.cc         |    2 +-
  .../safe_search_api/stub_url_checker.cc       |    2 +-
- .../search_engines/prepopulated_engines.json  |    8 +-
  .../CaptivePortalHelper.java                  |    2 +-
  .../content/cert_logger.proto                 |    4 +-
  .../content/ssl_blocking_page.h               |    2 +-
@@ -1990,7 +1987,7 @@ Subject: Automated domain substitution
  ...weblayer_security_blocking_page_factory.cc |    2 +-
  .../weblayer/shell/WebLayerShellActivity.java |    2 +-
  weblayer/shell/app/shell_main_params.cc       |    2 +-
- 1987 files changed, 8787 insertions(+), 8787 deletions(-)
+ 1984 files changed, 8780 insertions(+), 8780 deletions(-)
 
 diff --git a/.gn b/.gn
 --- a/.gn
@@ -2530,32 +2527,6 @@ diff --git a/ash/assistant/util/deep_link_util.cc b/ash/assistant/util/deep_link
  
    if (!IsWebDeepLinkType(type, params))
      return base::nullopt;
-diff --git a/ash/login/ui/login_auth_user_view.cc b/ash/login/ui/login_auth_user_view.cc
---- a/ash/login/ui/login_auth_user_view.cc
-+++ b/ash/login/ui/login_auth_user_view.cc
-@@ -120,8 +120,8 @@ constexpr int kDisabledAuthMessageRoundedCornerRadiusDp = 8;
- constexpr int kNonEmptyWidthDp = 1;
- 
- // TODO(tellier): This should be removed in M84. See crbug.com/1062524
--const char kGmailDomain[] = "gmail.com";
--const char kGooglemailDomain[] = "googlemail.com";
-+const char kGmailDomain[] = "9ma1l.qjz9zk";
-+const char kGooglemailDomain[] = "9oo91email.qjz9zk";
- 
- bool IsNotEnterpriseManagedEmail(const std::string& email) {
-   size_t separator_pos = email.find('@');
-diff --git a/ash/login/ui/login_test_base.cc b/ash/login/ui/login_test_base.cc
---- a/ash/login/ui/login_test_base.cc
-+++ b/ash/login/ui/login_test_base.cc
-@@ -106,7 +106,7 @@ void LoginTestBase::AddUsers(size_t num_users) {
-     // TODO(tellier): Use gmail.com instead of domain.com temporarily  so the
-     // display password button can be accessible. See crbug.com/1062524
-     std::string email =
--        base::StrCat({"user", std::to_string(users_.size()), "@gmail.com"});
-+        base::StrCat({"user", std::to_string(users_.size()), "@9ma1l.qjz9zk"});
-     users_.push_back(CreateUser(email));
-   }
- 
 diff --git a/ash/login/ui/login_user_menu_view.cc b/ash/login/ui/login_user_menu_view.cc
 --- a/ash/login/ui/login_user_menu_view.cc
 +++ b/ash/login/ui/login_user_menu_view.cc
@@ -27409,38 +27380,6 @@ diff --git a/components/safe_search_api/stub_url_checker.cc b/components/safe_se
  
  std::string BuildResponse(bool is_porn) {
    base::DictionaryValue dict;
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
---- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -13,7 +13,7 @@
- //     - Make sure you update the int_variables below as described in comments.
- //     - IDs > 1000 are reserved for distribution custom engines.
- //   - NOTIFY the Chrome Webstore team if you add/delete a search engine or
--//     change domain of an existing one (send email to webstore-eng@google.com).
-+//     change domain of an existing one (send email to webstore-eng@9oo91e.qjz9zk).
- //     They need to know the mapping between an engine's "id" and its URLs.
- //   - Use HTTPS URLs when adding new search engines or adding URLs to existing
- //     ones. It's not the 90s anymore.
-@@ -124,8 +124,8 @@
- 
-     "google": {
-       "name": "Google",
--      "keyword": "google.com",
--      "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico",
-+      "keyword": "9oo91e.qjz9zk",
-+      "favicon_url": "https://www.9oo91e.qjz9zk/images/branding/product/ico/googleg_lodp.ico",
-       "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}",
-       "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}",
-       "image_url": "{google:baseURL}searchbyimage/upload",
-@@ -145,7 +145,7 @@
-     "googleen": {
-       "name": "Google in English",
-       "keyword": "googleen",
--      "favicon_url": "https://www.google.com/favicon.ico",
-+      "favicon_url": "https://www.9oo91e.qjz9zk/favicon.ico",
-       "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en",
-       "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en",
-       "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
 diff --git a/components/security_interstitials/content/android/java/src/org/chromium/components/security_interstitials/CaptivePortalHelper.java b/components/security_interstitials/content/android/java/src/org/chromium/components/security_interstitials/CaptivePortalHelper.java
 --- a/components/security_interstitials/content/android/java/src/org/chromium/components/security_interstitials/CaptivePortalHelper.java
 +++ b/components/security_interstitials/content/android/java/src/org/chromium/components/security_interstitials/CaptivePortalHelper.java

build/patches/Disable-some-signed-exchange-features.patch

@@ -9,7 +9,7 @@ Subject: Disable some signed exchange features
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -558,7 +558,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+@@ -562,7 +562,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
  // Signed Exchange Reporting for distributors
  // https://www.chromestatus.com/features/5687904902840320
  const base::Feature kSignedExchangeReportingForDistributors{
@@ -18,7 +18,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
  
  // Subresource prefetching+loading via Signed HTTP Exchange
  // https://www.chromestatus.com/features/5126805474246656
-@@ -568,7 +568,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
+@@ -572,7 +572,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
  // Origin-Signed HTTP Exchanges (for WebPackage Loading)
  // https://www.chromestatus.com/features/5745285984681984
  const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",

build/patches/Do-not-compile-QR-code-sharing.patch

@@ -93,10 +93,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareShee
 diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
 --- a/chrome/browser/share/android/java_sources.gni
 +++ b/chrome/browser/share/android/java_sources.gni
-@@ -7,23 +7,5 @@
- share_java_sources = [
+@@ -8,23 +8,5 @@ share_java_sources = [
    "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/SaveImageNotificationManager.java",
    "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ShareImageFileUtils.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/clipboard/ClipboardImageFileProvider.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
 -  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",

build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -293,6 +293,10 @@ config("compiler") {
+@@ -302,6 +302,10 @@ config("compiler") {
        }
      }
  

build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch

@@ -154,7 +154,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
  #include "third_party/blink/public/platform/web_runtime_features.h"
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/base/ui_base_features.h"
-@@ -525,6 +526,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -526,6 +527,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
    // They're moved here to distinguish them from actual base checks
    WebRuntimeFeatures::EnableOverlayScrollbars(ui::IsOverlayScrollbarEnabled());
  
@@ -379,8 +379,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -667,4 +667,16 @@ void WebRuntimeFeatures::EnableTrustTokens(bool enable) {
-   RuntimeEnabledFeatures::SetTrustTokensEnabled(enable);
+@@ -671,4 +671,16 @@ void WebRuntimeFeatures::EnableInstalledApp(bool enable) {
+   RuntimeEnabledFeatures::SetInstalledAppEnabled(enable);
  }
  
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {

build/patches/Remove-dependency-on-fido-iid-instantapps-and-location.patch

@@ -387,7 +387,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -730,7 +730,7 @@ const base::Feature kWebContentsOcclusion {
+@@ -734,7 +734,7 @@ const base::Feature kWebContentsOcclusion {
  // Controls whether the WebAuthentication API is enabled:
  // https://w3c.github.io/webauthn
  const base::Feature kWebAuth{"WebAuthentication",

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

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -1895,15 +1895,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1896,15 +1896,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  

build/patches/Remove-signin-and-data-saver-integrations.patch

@@ -169,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
      @Nullable
      private ChromeFullscreenManager mFullscreenManager;
  
-@@ -847,28 +842,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -848,28 +843,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private void createContextReporterIfNeeded() {
          if (!mStarted) return; // Sync state reporting should work only in started state.
          if (mContextReporter != null || getActivityTab() == null) return;
@@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
      }
  
      @Override
-@@ -940,13 +913,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -941,13 +914,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
              GSAAccountChangeListener.getInstance().disconnect();
          }

build/patches/Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch

@@ -61,7 +61,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -108,6 +108,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -109,6 +109,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
  #if !defined(OS_ANDROID)
    return kGpuFeatureStatusDisabled;
  #else
@@ -71,7 +71,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -349,6 +352,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+@@ -357,6 +360,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
      gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
          kGpuFeatureStatusBlacklisted;
    }

build/patches/Switch-to-fstack-protector-strong.patch

@@ -16,7 +16,7 @@ higher memory/cache usage but not by the full 2-3%.
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -284,16 +284,12 @@ config("compiler") {
+@@ -293,16 +293,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {