Merge pull request #815 from uazo/create-pull-request/patch-37d1c12

Git apply result for next-122 branch

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -183,7 +183,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
 
-@@ -356,6 +359,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+@@ -368,6 +371,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
      gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
          kGpuFeatureStatusBlocklisted;
    }

build/patches/Add-search-engine.patch

@@ -84,7 +84,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      {SearchEngineTier::kTopEngines, &google},
      {SearchEngineTier::kTopEngines, &bing},
      {SearchEngineTier::kTopEngines, &yahoo},
-@@ -1615,6 +1616,8 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
+@@ -1683,6 +1684,8 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
    for (size_t i = 0; i < num_engines; i++) {
      t_url.push_back(engines[i]);
    }

build/patches/Allow-building-without-supervised-users.patch

@@ -54,7 +54,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
  import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
  import org.chromium.ui.base.DeviceFormFactor;
-@@ -773,9 +772,7 @@ public class FeedSurfaceCoordinator
+@@ -775,9 +774,7 @@ public class FeedSurfaceCoordinator
       * Returns true if the supervised user feed should be displayed.
       */
      public boolean shouldDisplaySupervisedFeed() {

build/patches/Customize-selection-popup.patch

@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  import org.chromium.base.ObserverList;
  import org.chromium.base.TraceEvent;
  import org.chromium.base.supplier.ObservableSupplier;
-@@ -227,6 +228,13 @@ public class LayoutManagerImpl
+@@ -228,6 +229,13 @@ public class LayoutManagerImpl
                                          && launchType != TabLaunchType.FROM_RECENT_TABS
                                          && launchType != TabLaunchType.FROM_RESTORE_TABS_UI
                                  || (!getTabModelSelector().isIncognitoSelected() && incognito);

build/patches/Disable-all-promo-dialogs.patch

@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1198,6 +1198,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1210,6 +1210,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      }
 
      private boolean maybeShowPromo(Profile profile) {

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

@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
 --- a/android_webview/common/aw_features.cc
 +++ b/android_webview/common/aw_features.cc
-@@ -96,8 +96,8 @@ BASE_FEATURE(kWebViewJavaJsBridgeMojo,
+@@ -101,8 +101,8 @@ BASE_FEATURE(kWebViewJavaJsBridgeMojo,
 
  // Field trial feature for controlling support of Origin Trials on WebView.
  BASE_FEATURE(kWebViewOriginTrials,

build/patches/Move-navigation-bar-to-bottom.patch

@@ -1382,23 +1382,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java
-@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.ui.native_page.NativePageHost;
+@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.ui.native_page.NativePageHost;
  import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.ViewUtils;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
 
  /**
   * The native recent tabs page. Lists recently closed tabs, open windows and tabs from the user's
-@@ -55,6 +56,7 @@ public class RecentTabsPage
+@@ -56,6 +57,7 @@ public class RecentTabsPage
      private int mSnapshotListTop;
      private int mSnapshotWidth;
      private int mSnapshotHeight;
 +    private final int mTabStripAndToolbarHeight;
 
      /** Whether {@link #mView} is attached to the application window. */
      private boolean mIsAttachedToWindow;
-@@ -81,6 +83,8 @@ public class RecentTabsPage
+@@ -82,6 +84,8 @@ public class RecentTabsPage
          mActivity = activity;
          mRecentTabsManager = recentTabsManager;
          mPageHost = pageHost;
@@ -1407,7 +1407,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP
          Resources resources = activity.getResources();
 
          mTitle = resources.getString(R.string.recent_tabs);
-@@ -98,7 +102,8 @@ public class RecentTabsPage
+@@ -99,7 +103,8 @@ public class RecentTabsPage
 
          mView.addOnAttachStateChangeListener(this);
 
@@ -1417,7 +1417,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP
              mBrowserControlsStateProvider = browserControlsStateProvider;
              mBrowserControlsStateProvider.addObserver(this);
              onBottomControlsHeightChanged(
-@@ -297,7 +302,7 @@ public class RecentTabsPage
+@@ -300,7 +305,7 @@ public class RecentTabsPage
 
      private void updateMargins() {
          final View recentTabsRoot = mView.findViewById(R.id.recent_tabs_root);
@@ -1426,7 +1426,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP
          final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
          ViewGroup.MarginLayoutParams layoutParams =
                  (ViewGroup.MarginLayoutParams) recentTabsRoot.getLayoutParams();
-@@ -313,9 +318,17 @@ public class RecentTabsPage
+@@ -316,9 +321,17 @@ public class RecentTabsPage
 
          // If the content offset is different from the margin, we use translationY to position the
          // view in line with the content offset.
@@ -1549,7 +1549,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -188,6 +188,9 @@ import org.chromium.url.GURL;
+@@ -189,6 +189,9 @@ import org.chromium.url.GURL;
 
  import java.util.List;
 
@@ -1642,7 +1642,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
          mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
          if (mBackPressManager != null) {
              mBackPressManager.addHandler(
-@@ -2165,6 +2190,8 @@ public class ToolbarManager
+@@ -2173,6 +2198,8 @@ public class ToolbarManager
      private int getToolbarExtraYOffset() {
          int toolbarHairlineHeight =
                  mControlContainer.findViewById(R.id.toolbar_hairline).getHeight();
@@ -1651,7 +1651,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
          int extraYOffset =
                  mBrowserControlsSizer.getTopControlsHeight()
                          - (mControlContainer.getHeight() - toolbarHairlineHeight);
-@@ -2559,6 +2586,15 @@ public class ToolbarManager
+@@ -2567,6 +2594,15 @@ public class ToolbarManager
      private void setControlContainerTopMargin(int margin) {
          final ViewGroup.MarginLayoutParams layoutParams =
                  ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -2411,7 +2411,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
 --- a/chrome/browser/ui/android/toolbar/BUILD.gn
 +++ b/chrome/browser/ui/android/toolbar/BUILD.gn
-@@ -173,6 +173,7 @@ android_library("java") {
+@@ -174,6 +174,7 @@ android_library("java") {
      "//components/user_prefs/android:java",
      "//content/public/android:content_java",
      "//third_party/android_deps:material_design_java",
@@ -2422,15 +2422,15 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/andr
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java
-@@ -16,6 +16,7 @@ import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
+@@ -17,6 +17,7 @@ import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
  import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.modelutil.PropertyModel;
  import org.chromium.ui.util.ColorUtils;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
 
  /** Handles showing and hiding a scrim when url bar focus changes. */
  public class LocationBarFocusScrimHandler implements UrlFocusChangeListener {
-@@ -60,6 +61,10 @@ public class LocationBarFocusScrimHandler implements UrlFocusChangeListener {
+@@ -61,6 +62,10 @@ public class LocationBarFocusScrimHandler implements UrlFocusChangeListener {
          mContext = context;
 
          int topMargin = tabStripHeightSupplier.get() == null ? 0 : tabStripHeightSupplier.get();

build/patches/Remove-voice-recognition-integration.patch

@@ -419,7 +419,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  import org.chromium.chrome.browser.page_info.ChromePageInfo;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
-@@ -2503,10 +2502,6 @@ public class ToolbarManager
+@@ -2511,10 +2510,6 @@ public class ToolbarManager
          return mLocationBar.getOmniboxStub();
      }
 

build/patches/Restore-offline-indicator-v2-flag.patch

@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1064,7 +1064,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1076,7 +1076,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) {
          // TODO(crbug.com/1035584): Disable on tablets for now as we need to do one or two extra
          // things for tablets.
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
              return;
          }
 
-@@ -1090,6 +1091,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1102,6 +1103,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
          mStatusIndicatorCoordinator.addObserver(mStatusIndicatorObserver);
          mStatusIndicatorCoordinator.addObserver(mStatusBarColorController);