Pref service: Merge connectors and send a PrefRegistry in Connect().

services/preferences/public/cpp/preferences_struct_traits.h

Index: services/preferences/public/cpp/preferences_struct_traits.h
diff --git a/services/preferences/public/cpp/preferences_struct_traits.h b/services/preferences/public/cpp/preferences_struct_traits.h
index 568f37176180cc0098417d9ff73821df4bca6e41..194d2748b2451306e45cc00ce3e2716e5e0338d4 100644
--- a/services/preferences/public/cpp/preferences_struct_traits.h
+++ b/services/preferences/public/cpp/preferences_struct_traits.h
@@ -23,13 +23,13 @@ struct EnumTraits<::prefs::mojom::PrefStoreType,
 };
 
 template <>
-struct EnumTraits<::prefs::mojom::PersistentPrefStoreConnector_ReadError,
+struct EnumTraits<::prefs::mojom::PersistentPrefStoreConnection_ReadError,
                   ::PersistentPrefStore::PrefReadError> {
-  static prefs::mojom::PersistentPrefStoreConnector_ReadError ToMojom(
+  static prefs::mojom::PersistentPrefStoreConnection_ReadError ToMojom(
       PersistentPrefStore::PrefReadError input);
 
   static bool FromMojom(
-      prefs::mojom::PersistentPrefStoreConnector_ReadError input,
+      prefs::mojom::PersistentPrefStoreConnection_ReadError input,
       PersistentPrefStore::PrefReadError* output);
 };