Merge pull request #4070 from brave/fix-7087

Remove //content deps for iOS build
brave · Nov 25, 2019 · 4c60424 · 4c60424
2 parents f8a2849 + 001a559
commit 4c60424
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/components/brave_sync/BUILD.gn b/components/brave_sync/BUILD.gn
@@ -72,8 +72,11 @@ source_set("prefs") {
 
   deps = [
     "//components/prefs",
-    "//content/public/browser",
   ]
+
+  if (!is_ios) {
+    deps += [ "//content/public/browser" ]
+  }
 }
 
 source_set("switches") {

diff --git a/components/brave_sync/brave_sync_prefs.cc b/components/brave_sync/brave_sync_prefs.cc
@@ -13,13 +13,17 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
+
+#if !defined(OS_IOS)
+
 #include "content/public/browser/browser_thread.h"
 
 void MigrateBraveSyncPrefs(Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   PrefService* prefs = profile->GetPrefs();
   prefs->ClearPref(brave_sync::prefs::kSyncPrevSeed);
 }
+#endif  // !defined(OS_IOS)
 
 namespace brave_sync {
 namespace prefs {

diff --git a/components/brave_sync/brave_sync_prefs.h b/components/brave_sync/brave_sync_prefs.h
@@ -24,7 +24,9 @@ namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
+#if !defined(OS_IOS)
 void MigrateBraveSyncPrefs(Profile* profile);
+#endif  // !defined(OS_IOS)
 
 namespace brave_sync {