Set up cross device sync for Read Later.

This change is behind the kReadLater flag and allows read later items to
sync cross device. This also adds a 'Reading List' option to
chrome://settings/syncSetup/advanced on Desktop when the flag is
enabled.

Bug: 1109316
Change-Id: I676a3ffaf565095eb02b95ea1d86577c60dc652f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2504271
Commit-Queue: Caroline Rising <corising@chromium.org>
Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822228}

chrome/app/shared_settings_strings.grdp

@@ -276,6 +276,9 @@
   <message name="IDS_SETTINGS_BOOKMARKS_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing bookmarks between multiple browser instances.">
     Bookmarks
   </message>
+  <message name="IDS_SETTINGS_READING_LIST_CHECKBOX_LABEL" desc="Label for the checkbox which enables or disables syncing reading list between multiple browser instances.">
+    Reading List
+  </message>
   <message name="IDS_SETTINGS_ENCRYPTION_OPTIONS" desc="Title for the section which includes options for encrypting sync settings.">
     Encryption options
   </message>

chrome/app/shared_settings_strings_grdp/IDS_SETTINGS_READING_LIST_CHECKBOX_LABEL.png.sha1

+d82a9aba092da44ee87f4da5c3e60788ca8ce0d1
\ No newline at end of file

chrome/browser/resources/settings/people_page/sync_browser_proxy.js

@@ -57,7 +57,8 @@ cr.define('settings', function() {
   /**
    * The state of sync. This is the data structure sent back and forth between
    * C++ and JS. Its naming and structure is not optimal, but changing it would
-   * require changes to the C++ handler, which is already functional.
+   * require changes to the C++ handler, which is already functional. See
+   * PeopleHandler::PushSyncPrefs() for more details.
    * @typedef {{
    *   appsRegistered: boolean,
    *   appsSynced: boolean,
@@ -78,6 +79,8 @@ cr.define('settings', function() {
    *   paymentsIntegrationEnabled: boolean,
    *   preferencesRegistered: boolean,
    *   preferencesSynced: boolean,
+   *   readingListRegistered: boolean,
+   *   readingListSynced: boolean,
    *   setNewPassphrase: (boolean|undefined),
    *   syncAllDataTypes: boolean,
    *   tabsRegistered: boolean,

chrome/browser/resources/settings/people_page/sync_controls.html

@@ -117,6 +117,17 @@
         </cr-toggle>
       </div>
 
+      <div class="list-item" hidden="[[!syncPrefs.readingListRegistered]]">
+        <div id="readingListCheckboxLabel">
+          $i18n{readingListCheckboxLabel}
+        </div>
+        <cr-toggle checked="{{syncPrefs.readingListSynced}}"
+            on-change="onSingleSyncDataTypeChanged_"
+            disabled="[[syncPrefs.syncAllDataTypes]]"
+            aria-labelledby="readingListCheckboxLabel">
+        </cr-toggle>
+      </div>
+
       <div class="list-item" hidden="[[!syncPrefs.tabsRegistered]]">
         <div id="openTabsCheckboxLabel">
           $i18n{openTabsCheckboxLabel}

chrome/browser/resources/settings/people_page/sync_controls.js

@@ -17,6 +17,7 @@ const SyncPrefsIndividualDataTypes = [
   'typedUrlsSynced',
   'themesSynced',
   'bookmarksSynced',
+  'readingListSynced',
   'passwordsSynced',
   'tabsSynced',
   'paymentsIntegrationEnabled',

chrome/browser/sync/chrome_sync_client.cc

@@ -41,6 +41,7 @@
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/themes/theme_syncable_service.h"
+#include "chrome/browser/ui/read_later/reading_list_model_factory.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/browser/web_applications/web_app_sync_bridge.h"
@@ -67,6 +68,8 @@
 #include "components/metrics/demographics/user_demographics.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/prefs/pref_service.h"
+#include "components/reading_list/core/reading_list_model.h"
+#include "components/reading_list/features/reading_list_switches.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/send_tab_to_self/send_tab_to_self_sync_service.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
@@ -629,10 +632,13 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
 base::WeakPtr<syncer::ModelTypeControllerDelegate>
 ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
   switch (type) {
-    case syncer::READING_LIST:
-      // Reading List is only supported on iOS at the moment.
-      NOTREACHED();
-      return base::WeakPtr<syncer::ModelTypeControllerDelegate>();
+    case syncer::READING_LIST: {
+      DCHECK(reading_list::switches::IsReadingListEnabled());
+      return ReadingListModelFactory::GetForBrowserContext(profile_)
+          ->GetModelTypeSyncBridge()
+          ->change_processor()
+          ->GetControllerDelegate();
+    }
 #if defined(OS_CHROMEOS)
     case syncer::PRINTERS:
       return chromeos::SyncedPrintersManagerFactory::GetForBrowserContext(

chrome/browser/ui/webui/settings/people_handler_unittest.cc

@@ -109,6 +109,8 @@ std::string GetConfiguration(const base::DictionaryValue* extra_values,
                     types.Has(syncer::UserSelectableType::kPasswords));
   result.SetBoolean("preferencesSynced",
                     types.Has(syncer::UserSelectableType::kPreferences));
+  result.SetBoolean("readingListSynced",
+                    types.Has(syncer::UserSelectableType::kReadingList));
   result.SetBoolean("tabsSynced", types.Has(syncer::UserSelectableType::kTabs));
   result.SetBoolean("themesSynced",
                     types.Has(syncer::UserSelectableType::kThemes));
@@ -171,6 +173,8 @@ void CheckConfigDataTypeArguments(const base::DictionaryValue* dictionary,
             types.Has(syncer::UserSelectableType::kPasswords));
   CheckBool(dictionary, "preferencesSynced",
             types.Has(syncer::UserSelectableType::kPreferences));
+  CheckBool(dictionary, "readingListSynced",
+            types.Has(syncer::UserSelectableType::kReadingList));
   CheckBool(dictionary, "tabsSynced",
             types.Has(syncer::UserSelectableType::kTabs));
   CheckBool(dictionary, "themesSynced",
@@ -912,6 +916,7 @@ TEST_F(PeopleHandlerTest, ShowSetupSyncEverything) {
   CheckBool(dictionary, "extensionsRegistered", true);
   CheckBool(dictionary, "passwordsRegistered", true);
   CheckBool(dictionary, "preferencesRegistered", true);
+  CheckBool(dictionary, "readingListRegistered", true);
   CheckBool(dictionary, "tabsRegistered", true);
   CheckBool(dictionary, "themesRegistered", true);
   CheckBool(dictionary, "typedUrlsRegistered", true);

chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc

@@ -188,6 +188,7 @@ void AddSyncPageStrings(content::WebUIDataSource* html_source) {
       {"syncPageTitle", IDS_SETTINGS_SYNC_SYNC_AND_NON_PERSONALIZED_SERVICES},
       {"passphraseConfirmationPlaceholder",
        IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER},
+      {"readingListCheckboxLabel", IDS_SETTINGS_READING_LIST_CHECKBOX_LABEL},
       {"syncLoading", IDS_SETTINGS_SYNC_LOADING},
       {"themesAndWallpapersCheckboxLabel",
        IDS_SETTINGS_THEMES_AND_WALLPAPERS_CHECKBOX_LABEL},

chrome/test/data/webui/settings/sync_test_util.js

@@ -34,6 +34,8 @@ cr.define('sync_test_util', function() {
       paymentsIntegrationEnabled: true,
       preferencesRegistered: true,
       preferencesSynced: true,
+      readingListRegistered: true,
+      readingListSynced: true,
       setNewPassphrase: false,
       syncAllDataTypes: true,
       tabsRegistered: true,

components/reading_list/features/reading_list_switches.cc

@@ -15,7 +15,11 @@ namespace switches {
 const base::Feature kReadLater{"ReadLater", base::FEATURE_DISABLED_BY_DEFAULT};
 
 bool IsReadingListEnabled() {
+#if defined(OS_IOS)
   return BUILDFLAG(ENABLE_READING_LIST);
+#else
+  return base::FeatureList::IsEnabled(kReadLater);
+#endif
 }
 }  // namespace switches
 }  // namespace reading_list