brave · mihaiplesa · Jun 11, 2020 · Feb 26, 2020 · Feb 26, 2020 · Feb 27, 2020
@@ -49,3 +49,8 @@ components/brave_wallet/ @bbondy @ryanml
 
 # Brave Referrals Service
 components/brave_referrals/browser/brave_referrals_service* @simonhong
+
+# Brave Sync
+components/brave_sync/ @darkdh
+components/sync/driver/ @darkdh
+chromium_src/components/sync/ @darkdh
@@ -84,26 +84,6 @@ public long getDataSaved(Profile profile) {
         return BravePrefServiceBridgeJni.get().getDataSaved(profile);
     }
 
-    public String getSyncDeviceId() {
-        return BravePrefServiceBridgeJni.get().getSyncDeviceId();
-    }
-
-    public void setSyncDeviceName(String deviceName) {
-        BravePrefServiceBridgeJni.get().setSyncDeviceName(deviceName);
-    }
-
-    public String getSyncDeviceName() {
-        return BravePrefServiceBridgeJni.get().getSyncDeviceName();
-    }
-
-    public void setSyncSeed(String seed) {
-        BravePrefServiceBridgeJni.get().setSyncSeed(seed);
-    }
-
-    public String getSyncSeed() {
-        return BravePrefServiceBridgeJni.get().getSyncSeed();
-    }
-
     /**
      * @param whether SafetyNet check failed.
      */
@@ -233,14 +213,6 @@ interface Natives {
         void setOldAdsBlockedCount(Profile profile, long count);
         void setOldHttpsUpgradesCount(Profile profile, long count);
 
-        String getSyncDeviceId();
-
-        void setSyncDeviceName(String deviceName);
-        String getSyncDeviceName();
-
-        void setSyncSeed(String seed);
-        String getSyncSeed();
-
         void setSafetynetCheckFailed(boolean value);
         boolean getSafetynetCheckFailed();
 

diff --git a/app/brave_command_ids.h b/app/brave_command_ids.h
@@ -15,7 +15,6 @@
 #define IDC_NEW_TOR_CONNECTION_FOR_SITE     56002
 #define IDC_NEW_OFFTHERECORD_WINDOW_TOR 56003
 #define IDC_CONTENT_CONTEXT_OPENLINKTOR 56004
-#define IDC_SHOW_BRAVE_SYNC      56005
 #define IDC_SHOW_BRAVE_WALLET    56006
 #define IDC_ADD_NEW_PROFILE      56007
 #define IDC_OPEN_GUEST_PROFILE   56008

@@ -469,8 +469,126 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_SETTINGS_BRAVE_SYNC_TITLE" desc="The title for Brave Sync in settings">
         Sync
       </message>
-      <message name="IDS_SETTINGS_BRAVE_SYNC_LINK_LABEL" desc="Brave Sync link label">
-        Access Sync via
+      <message name="IDS_SETTINGS_BRAVE_SYNC_SETUP_ACTION_LABEL" desc="Brave Sync setup action label">
+        Start using sync
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_SETUP_TITLE" desc="Title for the Brave Sync settings setup section">
+        Sync Setup
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_SETUP_SUBTITLE" desc="Subtitle for the Brave Sync settings setup section">
+        To start, you will need Brave installed on all the devices you plan to sync. Then, securely link them together with a sync code.
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_MANAGE_ACTION_LABEL" desc="Brave Sync manage action label">
+        Manage your synced devices
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_MANAGER_TITLE" desc="Brave Sync manager title">
+        Sync Manager
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_SETTINGS_TITLE" desc="Brave Sync settings title">
+        Sync Settings
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_SETTINGS_SUBTITLE" desc="Brave Sync settings subtitle">
+        Manage what information you would like to sync between devices. These settings only affect this device.
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_DEVICE_LIST_TITLE" desc="Brave Sync device list title">
+        Device List
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_DEVICE_LIST_SUBTITLE" desc="Brave Sync device list subtitle">
+        The device list below includes all devices in your sync chain. Each device can be managed from any other device.
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_DEVICE_LIST_NAME_COLUMN" desc="Brave Sync device list table column title for device name">
+        Device Name
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_DEVICE_LIST_NAME_THIS_DEVICE" desc="Brave Sync device list label for device which is the device the user is currently using">
+        <ph name="DEVICE_NAME">$1<ex>my-computer-1</ex></ph> (This Device)
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_DEVICE_LIST_LAST_ACTIVE_COLUMN" desc="Brave Sync device list table column title for last active date">
+        Last Active
+      </message>
+      <message name="IDS_BRAVE_SYNC_SETUP_TITLE" desc="The Brave Sync title.">
+        Sync Setup
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_WORD_COUNT" desc="Text for Brave Sync word count message.">
+        Word count: <ph name="WORD_COUNT">$1<ex>24</ex></ph>
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SYNC_COPIED_TEXT" desc="The success state telling the user that a secret code was copied to the clipboard">
+        Copied!
+      </message>
+      <message name="IDS_BRAVE_SYNC_SETUP_DESCRIPTION" desc="The Sync phrase explaining what happens when you start a new sync chain. Appears when sync is disabled.">
+        To start, you will need Brave installed on all the devices you plan to sync. To chain them together, start a sync chain that you will use to securely link all of your devices together.
+      </message>
+      <message name="IDS_BRAVE_SYNC_START_NEW_CHAIN_BUTTON" desc="The Sync button that triggers a modal to start a new sync chian">
+        Start a new Sync Chain
+      </message>
+      <message name="IDS_BRAVE_SYNC_ENTER_CODE_BUTTON" desc="The Sync button that triggers a modal asking for the sync chain code passphrase">
+        I have a Sync Code
+      </message>
+      <message name="IDS_BRAVE_SYNC_VIEW_CODE_BUTTON" desc="The Sync button `view sync code` for viewing the passphrase and qr code needed to add a new device. triggers a modal with sync code">
+        View Sync Code
+      </message>
+      <message name="IDS_BRAVE_SYNC_CHOOSE_DEVICE_MOBILE_TITLE" desc="The Sync Phone/tablet word below the phone/tablet image. Appears in the `choose device type` modal">
+        Phone/Tablet
+      </message>
+      <message name="IDS_BRAVE_SYNC_CHOOSE_DEVICE_COMPUTER_TITLE" desc="The Sync Computer word below the computer image. Appears in the `choose device type` modal">
+        Computer
+      </message>
+      <message name="IDS_BRAVE_SYNC_SCAN_CODE_TITLE" desc="The Sync title for the `scan sync code` modal">
+        Sync Chain QR Code
+      </message>
+      <message name="IDS_BRAVE_SYNC_SCAN_CODE_DESCRIPTION_PARTIAL_1" desc="The Sync instructions for the `scan sync code` modal partial phrase (1)">
+        On your mobile device, navigate to Brave Sync in the Settings panel and click the button
+      </message>
+      <message name="IDS_BRAVE_SYNC_SCAN_CODE_DESCRIPTION_PARTIAL_2" desc="The Sync instructions for the `scan sync code` modal partial phrase (2)">
+        “Scan Sync Code”.
+      </message>
+      <message name="IDS_BRAVE_SYNC_SCAN_CODE_DESCRIPTION_PARTIAL_3" desc="The Sync instructions for the `scan sync code` modal partial phrase (3)">
+        Use your camera to scan the QR Code below.
+      </message>
+      <message name="IDS_BRAVE_SYNC_VIEW_CODE_TITLE" desc="The Sync title for the `view sync code` modal">
+        Sync Chain Code
+      </message>
+      <message name="IDS_BRAVE_SYNC_VIEW_CODE_DESCRIPTION_PARTIAL_1" desc="The Sync instructions for the `view sync code` modal partial phrase (1)">
+        On your target computer, navigate to Brave Sync in settings and click the button
+      </message>
+      <message name="IDS_BRAVE_SYNC_VIEW_CODE_DESCRIPTION_PARTIAL_2" desc="The Sync instructions for the `view sync code` modal partial phrase (2)">
+        “I have a Sync Code”.
+      </message>
+      <message name="IDS_BRAVE_SYNC_VIEW_CODE_DESCRIPTION_PARTIAL_3" desc="The Sync instructions for the `view sync code` modal partial phrase (3)">
+        Enter the sync chain code words shown below. Treat this code like a password. If someone gets ahold of it, they can read and modify your synced data.
+      </message>
+      <message name="IDS_BRAVE_SYNC_VIEW_CODE_QR_CODE_BUTTON" desc="The Sync description suggesting where to go with the current sync code">
+        View QR Code
+      </message>
+      <message name="IDS_BRAVE_SYNC_ENTER_CODE_TITLE" desc="The Sync modal title for `enter sync code`">
+        Enter a sync code
+      </message>
+      <message name="IDS_BRAVE_SYNC_ENTER_CODE_DESCRIPTION" desc="The Sync modal text for `enter sync code`">
+        Type your supplied sync chain code words into the form below.
+      </message>
+      <message name="IDS_BRAVE_SYNC_ADD_DEVICE_BUTTON" desc="The Sync button `add device` for adding a new device to the sync chain. triggers a modal with device options">
+        Add New Device
+      </message>
+      <message name="IDS_BRAVE_SYNC_CHOOSE_DEVICE_TITLE" desc="The Sync title to sync a new device. Appears in the `choose device type` modal">
+        Choose Device Type
+      </message>
+      <message name="IDS_BRAVE_SYNC_CHOOSE_DEVICE_DESCRIPTION" desc="The Sync title to select which device to sync. Appears in the `choose device type` modal">
+        Which type of device would you like to sync to?
+      </message>
+      <message name="IDS_BRAVE_SYNC_INVALID_SYNC_CODE_TITLE" desc="Error message in dialog for when sync words are invalid (title)">
+        Invalid sync code, please check and try again.
+      </message>
+      <message name="IDS_BRAVE_SYNC_RESET_BUTTON" desc="The Sync button that opens a modal to leave the current sync chain">
+        Leave Sync Chain
+      </message>
+      <message name="IDS_BRAVE_SYNC_RESET_CONFIRMATION" desc="Confirmation message prompt to make sure the user is ok with leaving sync">
+        If you reset Sync, you will have to re-enter a sync code from another device in order to sync with it. Are you sure you want to proceed?
+      </message>
+      <!-- Sync Infobar -->
+      <message name="IDS_BRAVE_SYNC_V2_MIGRATE_INFOBAR_MESSAGE" desc="Message text shown to users who used a previous version of Brave Sync and need to perform setup again for the new version.">
+        Brave Sync has been upgraded and requires setup
+      </message>
+      <message name="IDS_BRAVE_SYNC_V2_MIGRATE_INFOBAR_COMMAND" desc="Command text shown to users who used a previous version of Brave Sync and need to perform setup again for the new version.">
+        Begin Setup
       </message>
       <!-- Help Tips Page -->
       <message name="IDS_SETTINGS_HELP_TIPS" desc="Title for an item in the 'Help Tips' section of Brave Settings">

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -49,6 +49,20 @@
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #endif
 
+namespace {
+// staging "https://sync-v2.bravesoftware.com/v2" can be overriden by
+// switches::kSyncServiceURL manually
+#if defined(OFFICIAL_BUILD)
+// production
+const char kBraveSyncServiceURL[] = "https://sync-v2.brave.com/v2";
+#else
+// For local server development "http://localhost:8295/v2 can also be overriden
+// by switches::kSyncServiceURL
+// dev
+const char kBraveSyncServiceURL[] = "https://sync-v2.brave.software/v2";
+#endif
+}  // namespace
+
 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
 base::LazyInstance<BraveContentRendererClient>::DestructorAtExit
     g_brave_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
@@ -158,7 +172,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 
   // Brave's sync protocol does not use the sync service url
   command_line.AppendSwitchASCII(switches::kSyncServiceURL,
-                                 "https://no-thanks.invalid");
+                                 kBraveSyncServiceURL);
 
   // Enabled features.
   std::unordered_set<const char*> enabled_features = {

diff --git a/brave_paks.gni b/brave_paks.gni
@@ -4,7 +4,6 @@
 
 import("//brave/components/brave_ads/browser/buildflags/buildflags.gni")
 import("//brave/components/brave_rewards/browser/buildflags/buildflags.gni")
-import("//brave/components/brave_sync/buildflags/buildflags.gni")
 import("//brave/components/brave_webtorrent/browser/buildflags/buildflags.gni")
 import("//brave/components/speedreader/buildflags.gni")
 import("//build/config/locales.gni")
@@ -105,16 +104,6 @@ template("brave_extra_paks") {
       ]
     }
 
-    if (enable_brave_sync) {
-      sources += [
-        "$root_gen_dir/brave/components/brave_sync/brave_sync_resources.pak",
-      ]
-
-      deps += [
-        "//brave/components/brave_sync:resources",
-      ]
-    }
-
     if (enable_brave_webtorrent) {
       sources += [
         "$root_gen_dir/brave/components/brave_webtorrent/brave_webtorrent_resources.pak",

diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -29,8 +29,6 @@ source_set("browser_process") {
   ]
 
   sources = [
-    "autocomplete/brave_autocomplete_provider_client.cc",
-    "autocomplete/brave_autocomplete_provider_client.h",
     "autocomplete/brave_autocomplete_scheme_classifier.cc",
     "autocomplete/brave_autocomplete_scheme_classifier.h",
     "brave_shields/ad_block_pref_service_factory.cc",
@@ -134,6 +132,7 @@ source_set("browser_process") {
     "//brave/components/brave_referrals/browser",
     "//brave/components/brave_shields/browser",
     "//brave/components/brave_shields/common",
+    "//brave/components/brave_sync",
     "//brave/components/brave_wallet/browser/buildflags",
     "//brave/components/brave_wayback_machine:buildflags",
     "//brave/components/brave_webtorrent/browser/buildflags",

@@ -181,42 +181,6 @@ void JNI_BravePrefServiceBridge_SetOldHttpsUpgradesCount(JNIEnv* env,
     count + profile->GetPrefs()->GetUint64(kHttpsUpgrades));
 }
 
-ScopedJavaLocalRef<jstring> JNI_BravePrefServiceBridge_GetSyncDeviceId(
-    JNIEnv* env) {
-  return ConvertUTF8ToJavaString(env,
-                                 GetOriginalProfile()->GetPrefs()->GetString(
-                                     brave_sync::prefs::kSyncDeviceId));
-}
-
-void JNI_BravePrefServiceBridge_SetSyncDeviceName(
-    JNIEnv* env,
-    const JavaParamRef<jstring>& deviceName) {
-  return GetOriginalProfile()->GetPrefs()->SetString(
-      brave_sync::prefs::kSyncDeviceName,
-      ConvertJavaStringToUTF8(env, deviceName));
-}
-
-ScopedJavaLocalRef<jstring> JNI_BravePrefServiceBridge_GetSyncDeviceName(
-    JNIEnv* env) {
-  return ConvertUTF8ToJavaString(env,
-                                 GetOriginalProfile()->GetPrefs()->GetString(
-                                     brave_sync::prefs::kSyncDeviceName));
-}
-
-void JNI_BravePrefServiceBridge_SetSyncSeed(
-    JNIEnv* env,
-    const JavaParamRef<jstring>& seed) {
-  return GetOriginalProfile()->GetPrefs()->SetString(
-      brave_sync::prefs::kSyncSeed, ConvertJavaStringToUTF8(env, seed));
-}
-
-ScopedJavaLocalRef<jstring> JNI_BravePrefServiceBridge_GetSyncSeed(
-    JNIEnv* env) {
-  return ConvertUTF8ToJavaString(env,
-                                 GetOriginalProfile()->GetPrefs()->GetString(
-                                     brave_sync::prefs::kSyncSeed));
-}
-
 void JNI_BravePrefServiceBridge_SetSafetynetCheckFailed(
     JNIEnv* env,
     jboolean value) {

diff --git a/browser/autocomplete/brave_autocomplete_provider_client.cc b/browser/autocomplete/brave_autocomplete_provider_client.cc
diff --git a/browser/autocomplete/brave_autocomplete_provider_client.h b/browser/autocomplete/brave_autocomplete_provider_client.h