Pref service: Merge PrefStoreConnector interfaces.

services/preferences/public/cpp/persistent_pref_store_client.h

Index: services/preferences/public/cpp/persistent_pref_store_client.h
diff --git a/services/preferences/public/cpp/persistent_pref_store_client.h b/services/preferences/public/cpp/persistent_pref_store_client.h
index 7a1a29ab136f82d55d8a339f41d660049b462bd3..8d7241832209b6758acc80ecf49ec60b0ec59ad2 100644
--- a/services/preferences/public/cpp/persistent_pref_store_client.h
+++ b/services/preferences/public/cpp/persistent_pref_store_client.h
@@ -15,7 +15,6 @@
 
 namespace base {
 class Value;
-class DictionaryValue;
 }
 
 namespace prefs {
@@ -25,8 +24,10 @@ namespace prefs {
 class PersistentPrefStoreClient
     : public PrefStoreClientMixin<PersistentPrefStore> {
  public:
+  explicit PersistentPrefStoreClient(mojom::PrefStoreConnectorPtr connector);
+
   explicit PersistentPrefStoreClient(
-      mojom::PersistentPrefStoreConnectorPtr connector);
+      mojom::PersistentPrefStoreConnectionPtr connection);
 
   // WriteablePrefStore:
   void SetValue(const std::string& key,
@@ -53,13 +54,12 @@ class PersistentPrefStoreClient
   ~PersistentPrefStoreClient() override;
 
  private:
-  void OnCreateComplete(PrefReadError read_error,
-                        bool read_only,
-                        std::unique_ptr<base::DictionaryValue> cached_prefs,
-                        mojom::PersistentPrefStorePtr pref_store,
-                        mojom::PrefStoreObserverRequest observer_request);
+  void OnCreateComplete(mojom::PersistentPrefStoreConnectionPtr connection,

[tibell, 2017/03/23 02:22:04]

Rename to OnConnect.

[Sam McNally, 2017/03/23 02:36:26]

Done.

+                        std::unordered_map<PrefValueStore::PrefStoreType,
+                                           prefs::mojom::PrefStoreConnectionPtr>
+                            other_pref_stores);
 
-  mojom::PersistentPrefStoreConnectorPtr connector_;
+  mojom::PrefStoreConnectorPtr connector_;
   bool read_only_ = false;
   PrefReadError read_error_ = PersistentPrefStore::PREF_READ_ERROR_NONE;
   mojom::PersistentPrefStorePtr pref_store_;