From b05553d90c5aa2b2e3b6d75463b0cc7f52ad1ecd Mon Sep 17 00:00:00 2001
From: AlexeyBarabash <alexey@brave.com>
Date: Mon, 8 Jul 2024 00:15:13 +0300
Subject: [PATCH] Removed ToolbarManager.mShowStartSurfaceSupplier

Related Chromium change
https://source.chromium.org/chromium/chromium/src/+/76dc0890ae54c50d706857f7dbeb99076a4f07b1

	[Start] Clean up ToolbarManager and ToolbarLayout|Phone.

	In this CL, the followings are cleaned up:
	1) ToolbarManager: anything related to Start surface;
	2) ToolbarPhone: both |mIsShowingStartSurfaceHomepage| and
	   |mIsShowingStartSurfaceTabSwitcher| are always false. Remove both
	   and usages.
	3) ToolbarPhone#isLocationBarShownInGeneralNtpOrStartSurface() is
	   replaced by isLocationBarShownInGeneralNtp(), since "surface
	   polish" has enabled by default.
	4) ToolbarLayout#onStartSurfaceStateChanged(): remove this orphan
	   method.

	Bug: 344651414, 40221888, 40834987
	Change-Id: I089d6c8c5390477d305ea377bd2b6c0e97034ff0
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5675441
---
 android/java/apk_for_test.flags                               | 1 -
 .../chromium/chrome/browser/toolbar/BraveToolbarManager.java  | 1 -
 .../javatests/org/chromium/chrome/browser/BytecodeTest.java   | 4 ----
 .../org/brave/bytecode/BraveToolbarManagerClassAdapter.java   | 3 ---
 4 files changed, 9 deletions(-)

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index 99b8fb124f2..75f02628efa 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -127,7 +127,6 @@
     *** mActivityTabProvider;
     *** mAppThemeColorProvider;
     *** mScrimCoordinator;
-    *** mShowStartSurfaceSupplier;
     *** mMenuButtonCoordinator;
     *** mToolbarTabController;
     *** mLocationBar;
diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
index 7923cc0a6e8..53498887525 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -91,7 +91,6 @@ public class BraveToolbarManager extends ToolbarManager {
     private ActivityTabProvider mActivityTabProvider;
     private AppThemeColorProvider mAppThemeColorProvider;
     private ScrimCoordinator mScrimCoordinator;
-    private Supplier<Boolean> mShowStartSurfaceSupplier;
     private MenuButtonCoordinator mMenuButtonCoordinator;
     private ToolbarTabControllerImpl mToolbarTabController;
     private LocationBar mLocationBar;
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index c48cfaa0d9c..47c089e8da1 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -1676,10 +1676,6 @@ public class BytecodeTest {
         Assert.assertTrue(
                 fieldExists(
                         "org/chromium/chrome/browser/toolbar/ToolbarManager", "mScrimCoordinator"));
-        Assert.assertTrue(
-                fieldExists(
-                        "org/chromium/chrome/browser/toolbar/ToolbarManager",
-                        "mShowStartSurfaceSupplier"));
         Assert.assertTrue(
                 fieldExists(
                         "org/chromium/chrome/browser/toolbar/ToolbarManager",
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
index 650d6c816b6..04e838ff292 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
@@ -38,9 +38,6 @@ public class BraveToolbarManagerClassAdapter extends BraveClassVisitor {
         deleteField(sBraveToolbarManagerClassName, "mScrimCoordinator");
         makeProtectedField(sToolbarManagerClassName, "mScrimCoordinator");
 
-        deleteField(sBraveToolbarManagerClassName, "mShowStartSurfaceSupplier");
-        makeProtectedField(sToolbarManagerClassName, "mShowStartSurfaceSupplier");
-
         deleteField(sBraveToolbarManagerClassName, "mMenuButtonCoordinator");
         makeProtectedField(sToolbarManagerClassName, "mMenuButtonCoordinator");