Pref service: have Mash and Chrome connect to the right pref stores

services/preferences/pref_store_manager_impl.h

 // 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.
 
 #ifndef SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_
 #define SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_
 
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ skipping 32 matching lines @@
       public service_manager::Service {
  public:
   // Only replies to Connect calls when all |expected_pref_stores| have
   // registered.
   PrefStoreManagerImpl(
       std::set<PrefValueStore::PrefStoreType> expected_pref_stores,
       scoped_refptr<base::SequencedWorkerPool> worker_pool);
   ~PrefStoreManagerImpl() override;
 
  private:
-  using PrefStorePtrs =
-      std::unordered_map<PrefValueStore::PrefStoreType, mojom::PrefStorePtr>;
+  struct PendingConnect {

[Sam McNally, 2017/04/03 10:09:31]

Could this be defined in the .cc file?

[tibell, 2017/04/04 04:05:59]

Done.

+    PendingConnect(
+        mojom::PrefRegistryPtr pref_registry_in,
+        std::vector<PrefValueStore::PrefStoreType> already_connected_types_in,
+        const ConnectCallback& callback_in);
+    PendingConnect(PendingConnect&& other);
+    ~PendingConnect();
+
+    mojom::PrefRegistryPtr pref_registry;
+    // Pref stores the caller already is connected to (and hence we won't
+    // connect to these).
+    std::vector<PrefValueStore::PrefStoreType> already_connected_types;
+    ConnectCallback callback;
+  };
 
   // mojom::PrefStoreRegistry:
   void Register(PrefValueStore::PrefStoreType type,
                 mojom::PrefStorePtr pref_store_ptr) override;
 
   // mojom::PrefStoreConnector:
-  void Connect(mojom::PrefRegistryPtr pref_registry,
-               const ConnectCallback& callback) override;
+  void Connect(
+      mojom::PrefRegistryPtr pref_registry,
+      const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
+      const ConnectCallback& callback) override;
 
   // service_manager::InterfaceFactory<PrefStoreConnector>:
   void Create(const service_manager::Identity& remote_identity,
               prefs::mojom::PrefStoreConnectorRequest request) override;
 
   // service_manager::InterfaceFactory<PrefStoreRegistry>:
   void Create(const service_manager::Identity& remote_identity,
               prefs::mojom::PrefStoreRegistryRequest request) override;
 
   // service_manager::InterfaceFactory<PrefServiceControl>:
   void Create(const service_manager::Identity& remote_identity,
               prefs::mojom::PrefServiceControlRequest request) override;
 
   // PrefServiceControl:
   void Init(mojom::PersistentPrefStoreConfigurationPtr configuration) override;
 
   // service_manager::Service:
   void OnStart() override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // Called when a PrefStore previously registered using |Register| disconnects.
   void OnPrefStoreDisconnect(PrefValueStore::PrefStoreType type);
 
   // Have all the expected PrefStores connected?
   bool AllConnected() const;
 
   void ProcessPendingConnects();
 
-  void ConnectImpl(mojom::PrefRegistryPtr pref_registry,
-                   const ConnectCallback& callback);
+  void ConnectImpl(
+      mojom::PrefRegistryPtr pref_registry,
+      const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
+      const ConnectCallback& callback);
 
   void OnPersistentPrefStoreReady();
 
   // PrefStores that need to register before replying to any Connect calls.
   std::set<PrefValueStore::PrefStoreType> expected_pref_stores_;
 
   // Registered pref stores.
-  PrefStorePtrs pref_store_ptrs_;
+  std::unordered_map<PrefValueStore::PrefStoreType, mojom::PrefStorePtr>
+      pref_store_ptrs_;
 
   // We hold on to the connection request callbacks until all expected
   // PrefStores have registered.
-  std::vector<std::pair<ConnectCallback, mojom::PrefRegistryPtr>>
-      pending_connects_;
+  std::vector<PendingConnect> pending_connects_;
 
   mojo::BindingSet<mojom::PrefStoreConnector> connector_bindings_;
   mojo::BindingSet<mojom::PrefStoreRegistry> registry_bindings_;
   std::unique_ptr<PersistentPrefStoreImpl> persistent_pref_store_;
   mojo::Binding<mojom::PrefServiceControl> init_binding_;
 
   const scoped_refptr<DefaultPrefStore> defaults_;
   const std::unique_ptr<PrefStoreImpl> defaults_wrapper_;
 
   const scoped_refptr<base::SequencedWorkerPool> worker_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefStoreManagerImpl);
 };
 
 }  // namespace prefs
 
 #endif  // SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_