From 81f1d6723cdc06354aec207a5fe5e405e979405d Mon Sep 17 00:00:00 2001
From: AlexeyBarabash <AlexeyBarabash@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:50:25 +0200
Subject: [PATCH] Removed `Use Sync staging server` at `QA preferences`
 (#26804)

This fixes CI build failure appeared at `v1.75.58` and resolved deps violation

Fixes https://github.com/brave/brave-browser/issues/42596
---
 .../settings/developer/BraveQAPreferences.java  | 17 -----------------
 android/java/res/xml/qa_preferences.xml         |  6 ------
 build/android/BUILD.gn                          |  1 -
 build/android/config.gni                        |  1 -
 chromium_src/components/sync/service/DEPS       |  1 -
 .../sync/service/sync_service_impl.cc           | 15 ---------------
 components/sync/service/sources.gni             |  4 ----
 7 files changed, 45 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
index 7731ecac5f37..bb3c1005b75a 100644
--- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
@@ -23,8 +23,6 @@
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 
-import org.jni_zero.CalledByNative;
-
 import org.chromium.base.ContextUtils;
 import org.chromium.base.FileUtils;
 import org.chromium.base.Log;
@@ -56,7 +54,6 @@
 public class BraveQAPreferences extends BravePreferenceFragment
         implements OnPreferenceChangeListener, BraveRewardsObserver {
     private static final String PREF_USE_REWARDS_STAGING_SERVER = "use_rewards_staging_server";
-    private static final String PREF_USE_SYNC_STAGING_SERVER = "use_sync_staging_server";
     private static final String PREF_QA_MAXIMIZE_INITIAL_ADS_NUMBER =
             "qa_maximize_initial_ads_number";
     private static final String PREF_QA_DEBUG_NTP = "qa_debug_ntp";
@@ -75,7 +72,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
     private ChromeSwitchPreference mLinkSubscriptionOnStaging;
     private ChromeSwitchPreference mBraveDormantFeatureEngagement;
     private ChromeSwitchPreference mIsStagingServer;
-    private ChromeSwitchPreference mIsSyncStagingServer;
     private ChromeSwitchPreference mMaximizeAdsNumber;
     private ChromeSwitchPreference mDebugNTP;
     private ChromeSwitchPreference mVlogRewards;
@@ -119,13 +115,6 @@ public void onCreate(Bundle savedInstanceState) {
                 UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
                         .getBoolean(BravePref.USE_REWARDS_STAGING_SERVER));
 
-        mIsSyncStagingServer =
-                (ChromeSwitchPreference) findPreference(PREF_USE_SYNC_STAGING_SERVER);
-        if (mIsSyncStagingServer != null) {
-            mIsSyncStagingServer.setOnPreferenceChangeListener(this);
-        }
-        mIsSyncStagingServer.setChecked(isSyncStagingUsed());
-
         mMaximizeAdsNumber =
                 (ChromeSwitchPreference) findPreference(PREF_QA_MAXIMIZE_INITIAL_ADS_NUMBER);
         if (mMaximizeAdsNumber != null) {
@@ -268,7 +257,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         } else if (PREF_QA_MAXIMIZE_INITIAL_ADS_NUMBER.equals(preference.getKey())) {
             enableMaximumAdsNumber((boolean) newValue);
         } else if (PREF_QA_DEBUG_NTP.equals(preference.getKey())
-                || PREF_USE_SYNC_STAGING_SERVER.equals(preference.getKey())
                 || PREF_QA_VLOG_REWARDS.equals(preference.getKey())
                 || LinkSubscriptionUtils.PREF_LINK_SUBSCRIPTION_ON_STAGING.equals(
                         preference.getKey())
@@ -304,11 +292,6 @@ private static String getPreferenceString(String preferenceName) {
         return sharedPreferences.getString(preferenceName, "");
     }
 
-    @CalledByNative
-    public static boolean isSyncStagingUsed() {
-        return getPreferenceValue(PREF_USE_SYNC_STAGING_SERVER);
-    }
-
     public static boolean shouldVlogRewards() {
         return getPreferenceValue(PREF_QA_VLOG_REWARDS);
     }
diff --git a/android/java/res/xml/qa_preferences.xml b/android/java/res/xml/qa_preferences.xml
index af9c336efb5c..7877217a939b 100644
--- a/android/java/res/xml/qa_preferences.xml
+++ b/android/java/res/xml/qa_preferences.xml
@@ -26,12 +26,6 @@
         android:summaryOn="@string/text_on"
         android:summaryOff="@string/text_off" />
 
-    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
-        android:key="use_sync_staging_server"
-        android:title="Use Sync staging server"
-        android:summaryOn="@string/text_on"
-        android:summaryOff="@string/text_off" />
-
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="qa_maximize_initial_ads_number"
         android:title="Maximize initial ads number"
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index f441d0cf1e2b..9f5afcd87b8e 100644
--- a/build/android/BUILD.gn
+++ b/build/android/BUILD.gn
@@ -234,7 +234,6 @@ generate_jni("jni_headers") {
     "//brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java",
     "//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
     "//brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
-    "//brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
     "//brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
     "//brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
     "//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
diff --git a/build/android/config.gni b/build/android/config.gni
index 4c9258611191..1e8338853e48 100644
--- a/build/android/config.gni
+++ b/build/android/config.gni
@@ -122,7 +122,6 @@ brave_jni_headers_sources = [
   "//brave/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java",
   "//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
   "//brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
-  "//brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
   "//brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
   "//brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
   "//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
diff --git a/chromium_src/components/sync/service/DEPS b/chromium_src/components/sync/service/DEPS
index 33fd536ce176..b513ce0920c6 100644
--- a/chromium_src/components/sync/service/DEPS
+++ b/chromium_src/components/sync/service/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
   "+brave/components/brave_sync",
   "+brave/components/sync/service",
-  "+brave/build/android/jni_headers/BraveQAPreferences_jni.h",
 ]
diff --git a/chromium_src/components/sync/service/sync_service_impl.cc b/chromium_src/components/sync/service/sync_service_impl.cc
index 4c677509d61d..ec4ba4860da2 100644
--- a/chromium_src/components/sync/service/sync_service_impl.cc
+++ b/chromium_src/components/sync/service/sync_service_impl.cc
@@ -11,11 +11,6 @@
 #include "components/sync/base/command_line_switches.h"
 #include "components/sync/base/sync_util.h"
 
-#if BUILDFLAG(IS_ANDROID)
-#include "base/android/jni_android.h"
-#include "brave/build/android/jni_headers/BraveQAPreferences_jni.h"
-#endif
-
 namespace syncer {
 
 GURL BraveGetSyncServiceURL(const base::CommandLine& command_line,
@@ -53,16 +48,6 @@ GURL BraveGetSyncServiceURL(const base::CommandLine& command_line,
       }
     }
   }
-#else
-  const char kBraveSyncServiceStagingURL[] =
-      "https://sync-v2.bravesoftware.com/v2";
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  bool b_use_staging_sync_server =
-      Java_BraveQAPreferences_isSyncStagingUsed(env);
-  if (b_use_staging_sync_server) {
-    return GURL(kBraveSyncServiceStagingURL);
-  }
 #endif
 
   // Default logic.
diff --git a/components/sync/service/sources.gni b/components/sync/service/sources.gni
index fdea9658712a..fd092bddfea1 100644
--- a/components/sync/service/sources.gni
+++ b/components/sync/service/sources.gni
@@ -20,7 +20,3 @@ brave_components_sync_service_deps = [
   "//brave/components/brave_sync:prefs",
   "//brave/components/constants",
 ]
-
-if (is_android) {
-  brave_components_sync_service_deps += [ "//brave/build/android:jni_headers" ]
-}