[Android] Adjusts code for minor upstream code changes

android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java

@@ -10,7 +10,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.chromium.chrome.R;
+import org.chromium.chrome.browser.search_engines.R;
 import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
 import org.chromium.components.search_engines.TemplateUrl;
 

android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java

@@ -345,7 +345,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        getActivity().setTitle(R.string.sign_in_sync);
+        getActivity().setTitle(R.string.sync_category_title);
 
         mScrollViewSyncInitial = (ScrollView) getView().findViewById(R.id.view_sync_initial);
         mScrollViewSyncChainCode = (ScrollView) getView().findViewById(R.id.view_sync_chain_code);

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -130,7 +130,7 @@ public class BraveToolbarManager extends ToolbarManager {
             ObservableSupplier<Boolean> omniboxFocusStateSupplier,
             OneshotSupplier<ToolbarIntentMetadata> intentMetadataOneshotSupplier,
             OneshotSupplier<Boolean> promoShownOneshotSupplier, WindowAndroid windowAndroid,
-            Supplier<Boolean> isInOverviewModeSupplier, boolean isCustomTab,
+            Supplier<Boolean> isInOverviewModeSupplier,
             Supplier<ModalDialogManager> modalDialogManagerSupplier,
             StatusBarColorController statusBarColorController, AppMenuDelegate appMenuDelegate,
             ActivityLifecycleDispatcher activityLifecycleDispatcher,
@@ -143,9 +143,8 @@ public class BraveToolbarManager extends ToolbarManager {
                 layoutStateProviderSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge,
                 tabModelSelectorSupplier, startSurfaceSupplier, omniboxFocusStateSupplier,
                 intentMetadataOneshotSupplier, promoShownOneshotSupplier, windowAndroid,
-                isInOverviewModeSupplier, isCustomTab, modalDialogManagerSupplier,
-                statusBarColorController, appMenuDelegate, activityLifecycleDispatcher,
-                startSurfaceParentTabSupplier);
+                isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController,
+                appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier);
         mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
         mLayoutStateProviderSupplier = layoutStateProviderSupplier;
         mActivity = activity;