Enable sync pseudo-USS codepath by default

The feature toggles are on track to be launched in M73 via server-side
variations, so let's enable them all by default for M74.

Bug: 902704
Change-Id: I0763b2ecb8a572d975cd6da56892e74e3da59a2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1503572
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Auto-Submit: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638319}

chrome/browser/sync/chrome_sync_client.cc

@@ -393,16 +393,21 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::SyncService* sync_service) {
   }
 
   // Search Engine sync is enabled by default.  Register unless explicitly
-  // disabled.
+  // disabled. The service can be null in tests.
+  TemplateURLService* template_url_service =
+      TemplateURLServiceFactory::GetForProfile(profile_);
   if (!disabled_types.Has(syncer::SEARCH_ENGINES)) {
-    if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSSearchEngines)) {
+    // TODO(mastiz): For the null case exercised in some tests, we should also
+    // exercise the new controller (which currently requires a non-null
+    // service).
+    if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSSearchEngines) &&
+        template_url_service) {
       controllers.push_back(std::make_unique<SearchEngineModelTypeController>(
           dump_stack, GetModelTypeStoreService()->GetStoreFactory(),
-          TemplateURLServiceFactory::GetForProfile(profile_)));
+          template_url_service));
     } else {
       controllers.push_back(std::make_unique<SearchEngineDataTypeController>(
-          dump_stack, sync_service, this,
-          TemplateURLServiceFactory::GetForProfile(profile_)));
+          dump_stack, sync_service, this, template_url_service));
     }
   }
 #endif  // !defined(OS_ANDROID)

components/sync/driver/sync_driver_switches.cc

@@ -45,29 +45,29 @@ const base::Feature kSyncAllowWalletDataInTransportModeWithCustomPassphrase{
 // For each below, if enabled, the SyncableService implementation of the
 // corresponding datatype(s) is wrapped within the USS architecture.
 const base::Feature kSyncPseudoUSSAppList{"SyncPseudoUSSAppList",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSApps{"SyncPseudoUSSApps",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
+                                       base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSDictionary{"SyncPseudoUSSDictionary",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+                                             base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSExtensionSettings{
-    "SyncPseudoUSSExtensionSettings", base::FEATURE_DISABLED_BY_DEFAULT};
+    "SyncPseudoUSSExtensionSettings", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSExtensions{"SyncPseudoUSSExtensions",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+                                             base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSFavicons{"SyncPseudoUSSFavicons",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+                                           base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSHistoryDeleteDirectives{
-    "SyncPseudoUSSHistoryDeleteDirectives", base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kSyncPseudoUSSPreferences{
-    "SyncPseudoUSSPreferences", base::FEATURE_DISABLED_BY_DEFAULT};
+    "SyncPseudoUSSHistoryDeleteDirectives", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kSyncPseudoUSSPreferences{"SyncPseudoUSSPreferences",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSPriorityPreferences{
-    "SyncPseudoUSSPriorityPreferences", base::FEATURE_DISABLED_BY_DEFAULT};
+    "SyncPseudoUSSPriorityPreferences", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSSearchEngines{
-    "SyncPseudoUSSSearchEngines", base::FEATURE_DISABLED_BY_DEFAULT};
+    "SyncPseudoUSSSearchEngines", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSSupervisedUsers{
-    "SyncPseudoUSSSupervisedUsers", base::FEATURE_DISABLED_BY_DEFAULT};
+    "SyncPseudoUSSSupervisedUsers", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kSyncPseudoUSSThemes{"SyncPseudoUSSThemes",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
+                                         base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Controls whether a user can send tabs between synced devices
 const base::Feature kSyncSendTabToSelf{"SyncSendTabToSelf",