Switch Preferences to use Factory

services/preferences/public/cpp/pref_observer_store.cc

 // Copyright 2016 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/pref_observer_store.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace preferences {
 
 PrefObserverStore::PrefObserverStore(
-    prefs::mojom::PreferencesManagerPtr prefs_manager_ptr)
+    prefs::mojom::PreferencesFactoryPtr pref_factory_ptr)
     : prefs_binding_(this),
-      prefs_manager_ptr_(std::move(prefs_manager_ptr)),
-      initialized_(false) {}
+      pref_factory_ptr_(std::move(pref_factory_ptr)),
+      initialized_(false) {
+  pref_factory_ptr_->Create(prefs_binding_.CreateInterfacePtrAndBind(),
+                            mojo::MakeRequest(&prefs_manager_ptr_));
+}
 
 void PrefObserverStore::Subscribe(const std::set<std::string>& keys) {
-  if (keys_.empty())
-    prefs_manager_ptr_->AddObserver(prefs_binding_.CreateInterfacePtrAndBind());
   keys_.insert(keys.begin(), keys.end());
 
   std::vector<std::string> pref_array;
   std::copy(keys_.begin(), keys_.end(), std::back_inserter(pref_array));
   prefs_manager_ptr_->Subscribe(pref_array);
 }
 
 bool PrefObserverStore::GetValue(const std::string& key,
                                  const base::Value** value) const {
   DCHECK(initialized_);
@@ skipping 62 matching lines @@
 
   for (base::DictionaryValue::Iterator it(*preferences); !it.IsAtEnd();
        it.Advance()) {
     if (keys_.find(it.key()) == keys_.end())
       continue;
     ValueMapPrefStore::SetValue(it.key(), it.value().CreateDeepCopy(), 0);
   }
 }
 
 }  // namespace preferences