Merge pull request #3988 from brave/sync_prefs_redo_issue_6504

Sync prefs redo issue 6504
brave · Nov 25, 2019 · b226231 · b226231
2 parents 45487f7 + 47c29b6
commit b226231
Show file tree

Hide file tree

Showing 12 changed files with 214 additions and 284 deletions.
diff --git a/chromium_src/chrome/browser/prefs/browser_prefs.cc b/chromium_src/chrome/browser/prefs/browser_prefs.cc
@@ -3,8 +3,9 @@
  * 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/. */
 
-#include "brave/browser/brave_profile_prefs.h"
 #include "brave/browser/brave_local_state_prefs.h"
+#include "brave/browser/brave_profile_prefs.h"
+#include "brave/components/brave_sync/brave_sync_prefs.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
 #if BUILDFLAG(ENABLE_WIDEVINE)
@@ -23,5 +24,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
   // Added 11/2019.
   MigrateWidevinePrefs(profile);
 #endif
+  // Added 11/2019.
+  MigrateBraveSyncPrefs(profile);
 }
 
diff --git a/components/brave_sync/BUILD.gn b/components/brave_sync/BUILD.gn
@@ -35,8 +35,8 @@ if (enable_brave_sync) {
       "//components/prefs",
       "//components/prefs",
       "//components/signin/public/identity_manager",
-      "//components/sync/driver:driver",
       "//components/sync:rest_of_sync",
+      "//components/sync/driver:driver",
       "//content/public/browser",
       "//extensions/browser",
       "//net",
@@ -72,6 +72,7 @@ source_set("prefs") {
 
   deps = [
     "//components/prefs",
+    "//content/public/browser",
   ]
 }
 
@@ -100,9 +101,7 @@ source_set("crypto") {
   ]
 
   if (is_android) {
-    deps += [
-      "//third_party/android_sdk:cpu_features",
-    ]
+    deps += [ "//third_party/android_sdk:cpu_features" ]
   }
 }