[Android] Fix for languages setting

android/java/org/chromium/chrome/browser/language/settings/BraveLanguageSettings.java

@@ -7,16 +7,17 @@ package org.chromium.chrome.browser.language.settings;
 
 import android.os.Bundle;
 
-import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import androidx.preference.PreferenceCategory;
 
 public class BraveLanguageSettings extends LanguageSettings {
-    static final String TRANSLATE_SWITCH_KEY = "translate_switch";
+    static final String TRANSLATION_SETTINGS_SECTION = "translation_settings_section";
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
-        ChromeSwitchPreference translateSwitch =
-                (ChromeSwitchPreference) findPreference(TRANSLATE_SWITCH_KEY);
+
+        PreferenceCategory translateSwitch =
+                (PreferenceCategory) findPreference(TRANSLATION_SETTINGS_SECTION);
         if (translateSwitch != null) {
             getPreferenceScreen().removePreference(translateSwitch);
         }

android/javatests/org/chromium/chrome/browser/language/settings/BraveLanguageSettingsTest.java

@@ -0,0 +1,46 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.language.settings;
+
+import static org.junit.Assert.assertTrue;
+
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.preference.PreferenceCategory;
+import androidx.test.filters.SmallTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.chrome.browser.language.R;
+import org.chromium.chrome.browser.settings.SettingsActivity;
+import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class BraveLanguageSettingsTest {
+    static final String TRANSLATION_SETTINGS_SECTION = "translation_settings_section";
+
+    @Rule
+    public final SettingsActivityTestRule<LanguageSettings> mSettingsActivityTestRule =
+            new SettingsActivityTestRule<>(LanguageSettings.class);
+    private LanguageSettings mLanguageSettings;
+
+    @Before
+    public void setUp() throws Exception {
+        mSettingsActivityTestRule.startSettingsActivity();
+        mLanguageSettings = mSettingsActivityTestRule.getFragment();
+    }
+
+    @Test
+    @SmallTest
+    public void testRemovedSettings() {
+        PreferenceCategory pref = mLanguageSettings.findPreference(TRANSLATION_SETTINGS_SECTION);
+        assertTrue(pref != null);
+        assertTrue(!pref.isEnabled());
+    }
+}

test/BUILD.gn

@@ -1185,6 +1185,7 @@ if (is_android) {
       "//brave/android/javatests/org/chromium/chrome/browser/BytecodeTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/brave_wallet/BraveWalletUtilsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/contextmenu/BraveContextMenuPopulatorTest.java",
+      "//brave/android/javatests/org/chromium/chrome/browser/language/settings/BraveLanguageSettingsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/safe_browsing/settings/BraveSafeBrowsingSettingsFragmentTest.java",
@@ -1202,6 +1203,7 @@ if (is_android) {
       "//chrome/browser/feed/android:java",
       "//chrome/browser/flags:java",
       "//chrome/browser/fullscreen/android:java",
+      "//chrome/browser/language/android:java",
       "//chrome/browser/password_manager/android:java",
       "//chrome/browser/preferences:java",
       "//chrome/browser/prefetch/android:java",