Enable internal translate engine

browser/about_flags.cc

@@ -22,6 +22,8 @@
 #include "brave/components/ntp_background_images/browser/features.h"
 #include "brave/components/sidebar/buildflags/buildflags.h"
 #include "brave/components/speedreader/buildflags.h"
+#include "brave/components/translate/core/common/brave_translate_features.h"
+#include "brave/components/translate/core/common/buildflags.h"
 #include "net/base/features.h"
 
 #if BUILDFLAG(ENABLE_BRAVE_VPN) && !defined(OS_ANDROID)
@@ -217,6 +219,13 @@ constexpr char kUseDevUpdaterUrlDescription[] =
     "Use the dev url for the component updater. "
     "This is for internal testing only.";
 
+constexpr char kBraveTranslateGoName[] =
+    "Enable internal translate engine (brave-translate-go)";
+constexpr char kBraveTranslateGoDescription[] =
+    "Enable internal translate engine, which are build on top of client engine "
+    "and brave translation backed. Also disables suggestions to install google "
+    "translate extension.";
+
 }  // namespace
 
 }  // namespace flag_descriptions
@@ -300,6 +309,17 @@ constexpr char kUseDevUpdaterUrlDescription[] =
 #define BRAVE_DECENTRALIZED_DNS_FEATURE_ENTRIES
 #endif
 
+#if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
+#define BRAVE_TRANSLATE_GO_FEATURE_ENTRIES                           \
+    {"brave-translate-go",                                           \
+     flag_descriptions::kBraveTranslateGoName,                       \
+     flag_descriptions::kBraveTranslateGoDescription,                \
+     kOsDesktop,                                                     \
+     FEATURE_VALUE_TYPE(translate::features::kUseBraveTranslateGo)},
+#else
+#define BRAVE_TRANSLATE_GO_FEATURE_ENTRIES
+#endif  // BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
+
 #define BRAVE_ABOUT_FLAGS_FEATURE_ENTRIES                                   \
     {"use-dev-updater-url",                                                 \
      flag_descriptions::kUseDevUpdaterUrlName,                              \
@@ -391,4 +411,5 @@ constexpr char kUseDevUpdaterUrlDescription[] =
     BRAVE_REWARDS_GEMINI_FEATURE_ENTRIES                                    \
     BRAVE_VPN_FEATURE_ENTRIES                                               \
     SIDEBAR_FEATURE_ENTRIES                                                 \
-    SPEEDREADER_FEATURE_ENTRIES
+    SPEEDREADER_FEATURE_ENTRIES                                             \
+    BRAVE_TRANSLATE_GO_FEATURE_ENTRIES

browser/brave_browser_main_parts.cc

@@ -15,9 +15,13 @@
 #include "brave/components/brave_sync/features.h"
 #include "brave/components/speedreader/buildflags.h"
 #include "brave/components/tor/buildflags/buildflags.h"
+#include "brave/components/translate/core/common/brave_translate_constants.h"
+#include "brave/components/translate/core/common/brave_translate_features.h"
 #include "chrome/common/chrome_features.h"
 #include "components/prefs/pref_service.h"
 #include "components/sync/driver/sync_driver_switches.h"
+#include "components/translate/core/browser/translate_language_list.h"
+#include "components/translate/core/common/translate_switches.h"
 #include "content/public/browser/render_frame_host.h"
 #include "extensions/buildflags/buildflags.h"
 #include "media/base/media_switches.h"
@@ -152,8 +156,8 @@ void BraveBrowserMainParts::PreShutdown() {
 
 void BraveBrowserMainParts::PreProfileInit() {
   ChromeBrowserMainParts::PreProfileInit();
-#if !defined(OS_ANDROID)
   auto* command_line = base::CommandLine::ForCurrentProcess();
+#if !defined(OS_ANDROID)
   if (!base::FeatureList::IsEnabled(brave_sync::features::kBraveSync)) {
     // Disable sync temporarily
     if (!command_line->HasSwitch(switches::kDisableSync))
@@ -164,6 +168,23 @@ void BraveBrowserMainParts::PreProfileInit() {
     command_line->RemoveSwitch(switches::kDisableSync);
   }
 #endif
+
+  // Redirect the translate script request to the Brave
+  // endpoints.
+  if (!command_line->HasSwitch(translate::switches::kTranslateScriptURL)) {
+    command_line->AppendSwitchASCII(translate::switches::kTranslateScriptURL,
+                                    translate::kBraveTranslateScriptURL);
+  }
+
+  // Redirect the rest native translate requests.
+  if (!command_line->HasSwitch(translate::switches::kTranslateSecurityOrigin)) {
+    command_line->AppendSwitchASCII(
+        translate::switches::kTranslateSecurityOrigin,
+        translate::kBraveTranslateOrigin);
+  }
+
+  if (!translate::ShouldUpdateLanguagesList())
+    translate::TranslateLanguageList::DisableUpdate();
 }
 
 void BraveBrowserMainParts::PostProfileInit() {

browser/brave_content_browser_client.cc

@@ -54,6 +54,7 @@
 #include "brave/components/speedreader/buildflags.h"
 #include "brave/components/speedreader/speedreader_util.h"
 #include "brave/components/tor/buildflags/buildflags.h"
+#include "brave/components/translate/core/common/brave_translate_switches.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_browser_interface_binders.h"
@@ -544,6 +545,13 @@ void BraveContentBrowserClient::AppendExtraCommandLineSwitches(
     }
     command_line->AppendSwitchASCII("brave_session_token",
                                     base::NumberToString(session_token));
+
+    // Switches to pass to render processes.
+    static const char* const kSwitchNames[] = {
+        translate::switches::kBraveTranslateUseGoogleEndpoint,
+    };
+    command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
+                                   base::size(kSwitchNames));
   }
 }
 

browser/net/BUILD.gn

@@ -1,4 +1,3 @@
-import("//brave/browser/translate/buildflags/buildflags.gni")
 import("//brave/components/brave_referrals/buildflags/buildflags.gni")
 import("//brave/components/brave_wallet/common/buildflags/buildflags.gni")
 import("//brave/components/brave_webtorrent/browser/buildflags/buildflags.gni")
@@ -49,7 +48,6 @@ source_set("net") {
     "//base",
     "//brave/app:brave_generated_resources_grit",
     "//brave/browser/safebrowsing",
-    "//brave/browser/translate/buildflags",
     "//brave/common",
     "//brave/components/brave_component_updater/browser",
     "//brave/components/brave_referrals/buildflags",
@@ -111,13 +109,6 @@ source_set("net") {
     ]
   }
 
-  if (enable_brave_translate_go) {
-    sources += [
-      "brave_translate_redirect_network_delegate_helper.cc",
-      "brave_translate_redirect_network_delegate_helper.h",
-    ]
-  }
-
   if (decentralized_dns_enabled && brave_wallet_enabled) {
     sources += [
       "decentralized_dns_network_delegate_helper.cc",

browser/net/brave_request_handler.cc

@@ -19,7 +19,6 @@
 #include "brave/browser/net/brave_site_hacks_network_delegate_helper.h"
 #include "brave/browser/net/brave_stp_util.h"
 #include "brave/browser/net/global_privacy_control_network_delegate_helper.h"
-#include "brave/browser/translate/buildflags/buildflags.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/brave_referrals/buildflags/buildflags.h"
 #include "brave/components/brave_rewards/browser/net/network_delegate_helper.h"
@@ -43,10 +42,6 @@
 #include "brave/browser/net/brave_torrent_redirect_network_delegate_helper.h"
 #endif
 
-#if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
-#include "brave/browser/net/brave_translate_redirect_network_delegate_helper.h"
-#endif
-
 #if BUILDFLAG(ENABLE_IPFS)
 #include "brave/browser/net/ipfs_redirect_network_delegate_helper.h"
 #include "brave/components/ipfs/features.h"
@@ -93,12 +88,6 @@ void BraveRequestHandler::SetupCallbacks() {
   callback = base::BindRepeating(brave_rewards::OnBeforeURLRequest);
   before_url_request_callbacks_.push_back(callback);
 
-#if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
-  callback =
-      base::BindRepeating(brave::OnBeforeURLRequest_TranslateRedirectWork);
-  before_url_request_callbacks_.push_back(callback);
-#endif
-
 #if BUILDFLAG(ENABLE_IPFS)
   if (base::FeatureList::IsEnabled(ipfs::features::kIpfsFeature)) {
     callback = base::BindRepeating(ipfs::OnBeforeURLRequest_IPFSRedirectWork);

browser/net/brave_static_redirect_network_delegate_helper.cc

@@ -11,9 +11,7 @@
 #include <vector>
 
 #include "base/strings/string_piece_forward.h"
-#include "brave/browser/translate/buildflags/buildflags.h"
 #include "brave/common/network_constants.h"
-#include "brave/common/translate_network_constants.h"
 #include "extensions/common/url_pattern.h"
 #include "net/base/net_errors.h"
 
@@ -88,12 +86,6 @@ int OnBeforeURLRequest_StaticRedirectWorkForGURL(
       URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS,
       kWidevineGoogleDlPrefix);
 
-#if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
-  static URLPattern translate_pattern(URLPattern::SCHEME_HTTPS,
-      kTranslateElementJSPattern);
-  static URLPattern translate_language_pattern(URLPattern::SCHEME_HTTPS,
-      kTranslateLanguagePattern);
-#endif
   if (geo_pattern.MatchesURL(request_url)) {
     *new_url = GURL(GOOGLEAPIS_ENDPOINT GOOGLEAPIS_API_KEY);
     return net::OK;
@@ -179,23 +171,7 @@ int OnBeforeURLRequest_StaticRedirectWorkForGURL(
     return net::OK;
   }
 
-#if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
-  if (translate_pattern.MatchesURL(request_url)) {
-    replacements.SetQueryStr(request_url.query_piece());
-    replacements.SetPathStr(request_url.path_piece());
-    *new_url =
-      GURL(kBraveTranslateEndpoint).ReplaceComponents(replacements);
-    return net::OK;
-  }
-
-  if (translate_language_pattern.MatchesURL(request_url)) {
-    *new_url = GURL(kBraveTranslateLanguageEndpoint);
-    return net::OK;
-  }
-#endif
-
   return net::OK;
 }
 
-
 }  // namespace brave

browser/net/brave_static_redirect_network_delegate_helper_unittest.cc

@@ -10,8 +10,6 @@
 
 #include "base/strings/string_util.h"
 #include "brave/browser/net/url_context.h"
-#include "brave/browser/translate/buildflags/buildflags.h"
-#include "brave/common/translate_network_constants.h"
 #include "components/component_updater/component_updater_url_constants.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -284,35 +282,3 @@ TEST(BraveStaticRedirectNetworkDelegateHelperTest,
   EXPECT_EQ(request_info->new_url_spec, expected_url);
   EXPECT_EQ(rc, net::OK);
 }
-
-#if BUILDFLAG(ENABLE_BRAVE_TRANSLATE_GO)
-TEST(BraveStaticRedirectNetworkDelegateHelperTest, RedirectTranslate) {
-  const std::string query_string(
-      "?cb=cr.googleTranslate.onTranslateElementLoad&aus=true&"
-      "clc=cr.googleTranslate.onLoadCSS&"
-      "jlc=cr.googleTranslate.onLoadJavascript&hl=en&key=DUMMY_KEY");
-  const std::string path_string("/translate_a/element.js");
-  const std::string google_host_string("https://translate.googleapis.com");
-  const GURL url(google_host_string + path_string + query_string);
-  const GURL expected_url(kBraveTranslateServer + path_string + query_string);
-
-  auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
-  int rc =
-      OnBeforeURLRequest_StaticRedirectWork(ResponseCallback(), request_info);
-  EXPECT_EQ(request_info->new_url_spec, expected_url);
-  EXPECT_EQ(rc, net::OK);
-}
-
-TEST(BraveStaticRedirectNetworkDelegateHelperTest, RedirectTranslateLanguage) {
-  const GURL url(
-      "https://translate.googleapis.com/translate_a/l?"
-      "client=chrome&hl=en&key=DUMMY_KEY");
-  const GURL expected_url(kBraveTranslateLanguageEndpoint);
-
-  auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
-  int rc =
-      OnBeforeURLRequest_StaticRedirectWork(ResponseCallback(), request_info);
-  EXPECT_EQ(request_info->new_url_spec, expected_url);
-  EXPECT_EQ(rc, net::OK);
-}
-#endif