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

services/preferences/public/cpp/preferences_struct_traits.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/preferences/public/cpp/preferences_struct_traits.h"
 
 namespace mojo {
 
 using PrefStoreType = prefs::mojom::PrefStoreType;
 
@@ skipping 43 matching lines @@
     case PrefStoreType::RECOMMENDED:
       *output = PrefValueStore::RECOMMENDED_STORE;
       return true;
     case PrefStoreType::DEFAULT:
       *output = PrefValueStore::DEFAULT_STORE;
       return true;
   }
   return false;
 }
 
-using MojomReadError = prefs::mojom::PersistentPrefStoreConnector_ReadError;
+using MojomReadError = prefs::mojom::PersistentPrefStoreConnection_ReadError;
 
 MojomReadError
 EnumTraits<MojomReadError, PersistentPrefStore::PrefReadError>::ToMojom(
     PersistentPrefStore::PrefReadError input) {
   switch (input) {
     case PersistentPrefStore::PREF_READ_ERROR_NONE:
       return MojomReadError::NONE;
     case PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE:
       return MojomReadError::JSON_PARSE;
     case PersistentPrefStore::PREF_READ_ERROR_JSON_TYPE:
@@ skipping 52 matching lines @@
       return true;
     case MojomReadError::ASYNCHRONOUS_TASK_INCOMPLETE:
       *output =
           PersistentPrefStore::PREF_READ_ERROR_ASYNCHRONOUS_TASK_INCOMPLETE;
       return true;
   }
   return false;
 }
 
 }  // namespace mojo