Avoid ifdefs for READING_LIST

There are multiple datatypes that are platform-dependent and
nevertheless the types and enum values are compiled (no ifdef).

This patch does the same for READING_LIST which is no different.

Bug: 950874
Change-Id: I5598d1e7b221c1f4a1338bb83397066c2b79be60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893198
Auto-Submit: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712490}

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

@@ -118,6 +118,11 @@ std::string GetConfiguration(const base::DictionaryValue* extra_values,
   result.SetBoolean("typedUrlsSynced",
                     types.Has(syncer::UserSelectableType::kHistory));
   result.SetBoolean("paymentsIntegrationEnabled", false);
+
+  // Reading list doesn't really have a UI and is supported on ios only.
+  result.SetBoolean("readingListSynced",
+                    types.Has(syncer::UserSelectableType::kReadingList));
+
   std::string args;
   base::JSONWriter::Write(result, &args);
   return args;

components/sync/base/BUILD.gn

@@ -83,7 +83,6 @@ jumbo_static_library("base") {
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/prefs",
-    "//components/reading_list/features:reading_list_buildflags",
     "//components/version_info",
     "//crypto",
     "//net",

components/sync/base/model_type.h

@@ -12,7 +12,6 @@
 #include <string>
 
 #include "base/logging.h"
-#include "components/reading_list/features/reading_list_buildflags.h"
 #include "components/sync/base/enum_set.h"
 
 namespace base {

components/sync/base/sync_prefs.cc

@@ -17,7 +17,6 @@
 #include "base/values.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
-#include "components/reading_list/features/reading_list_buildflags.h"
 #include "components/sync/base/pref_names.h"
 #include "components/sync/base/user_selectable_type.h"
 
@@ -113,10 +112,8 @@ const char* GetPrefNameForType(UserSelectableType type) {
       return prefs::kSyncExtensions;
     case UserSelectableType::kApps:
       return prefs::kSyncApps;
-#if BUILDFLAG(ENABLE_READING_LIST)
     case UserSelectableType::kReadingList:
       return prefs::kSyncReadingList;
-#endif
     case UserSelectableType::kTabs:
       return prefs::kSyncTabs;
     case UserSelectableType::kWifiConfigurations:

components/sync/base/user_selectable_type.cc

@@ -58,10 +58,8 @@ UserSelectableTypeInfo GetUserSelectableTypeInfo(UserSelectableType type) {
     case UserSelectableType::kApps:
       return {
           "apps", APPS, {APPS, APP_SETTINGS, APP_LIST, ARC_PACKAGE, WEB_APPS}};
-#if BUILDFLAG(ENABLE_READING_LIST)
     case UserSelectableType::kReadingList:
       return {"readingList", READING_LIST, {READING_LIST}};
-#endif
     case UserSelectableType::kTabs:
       return {"tabs",
               PROXY_TABS,

components/sync/base/user_selectable_type.h

@@ -5,7 +5,6 @@
 #ifndef COMPONENTS_SYNC_BASE_USER_SELECTABLE_TYPE_H_
 #define COMPONENTS_SYNC_BASE_USER_SELECTABLE_TYPE_H_
 
-#include "components/reading_list/features/reading_list_buildflags.h"
 #include "components/sync/base/enum_set.h"
 #include "components/sync/base/model_type.h"
 
@@ -22,11 +21,7 @@ enum class UserSelectableType {
   kHistory,
   kExtensions,
   kApps,
-// TODO(crbug.com/950874): remove this usage of ENABLE_READING_LIST build
-// flag.
-#if BUILDFLAG(ENABLE_READING_LIST)
   kReadingList,
-#endif
   kWifiConfigurations,
   kTabs,
   kLastType = kTabs