Mario Sanchez Prada
d2faa51130
This CL touches only those patches which updated cleanly, conflicts resolution to be handled in a follow-up patch.
14 lines
863 B
Diff
14 lines
863 B
Diff
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java
|
|
index 3160cd7ad38a0b777dd17e7686ebeb25fc335d76..45e4e019e9b753175ce794426290b3b3aa980f5f 100644
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java
|
|
@@ -78,7 +78,7 @@ public class AndroidSyncSettings {
|
|
ThreadUtils.assertOnUiThread();
|
|
if (sInstance == null) {
|
|
SyncContentResolverDelegate contentResolver = new SystemSyncContentResolverDelegate();
|
|
- sInstance = new AndroidSyncSettings(contentResolver);
|
|
+ sInstance = new BraveAndroidSyncSettings(contentResolver);
|
|
}
|
|
return sInstance;
|
|
}
|