PreferencesManager

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/values.h"
 #include "mojo/common/common_custom_types.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 PrefObserverStore::PrefObserverStore(
     prefs::mojom::PreferencesManagerPtr prefs_manager_ptr)
     : prefs_binding_(this),
       prefs_manager_ptr_(std::move(prefs_manager_ptr)),
       initialized_(false) {}
 
-void PrefObserverStore::Init(const std::set<std::string>& keys) {
-  DCHECK(!initialized_);
-  keys_ = keys;
+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_->AddObserver(pref_array,
-                                  prefs_binding_.CreateInterfacePtrAndBind());
+  prefs_manager_ptr_->Subscribe(pref_array);
 }
 
 bool PrefObserverStore::GetValue(const std::string& key,
                                  const base::Value** value) const {
   DCHECK(initialized_);
   DCHECK(keys_.find(key) != keys_.end());
 
   return ValueMapPrefStore::GetValue(key, value);
 }
 
@@ skipping 29 matching lines @@
   ValueMapPrefStore::ReportValueChanged(key, flags);
 }
 
 void PrefObserverStore::SetValueSilently(const std::string& key,
                                          std::unique_ptr<base::Value> value,
                                          uint32_t flags) {
   SetValueOnPreferenceManager(key, *value);
   ValueMapPrefStore::SetValueSilently(key, std::move(value), flags);
 }
 
-PrefObserverStore::~PrefObserverStore() {}
+PrefObserverStore::~PrefObserverStore() {
+  ClearObservers();
+}
 
 void PrefObserverStore::SetValueOnPreferenceManager(const std::string& key,
                                                     const base::Value& value) {
   if (keys_.find(key) == keys_.end())
     return;
 
   base::DictionaryValue prefs;
   prefs.Set(key, value.CreateDeepCopy());
   prefs_manager_ptr_->SetPreferences(prefs);
 }
 
 void PrefObserverStore::OnPreferencesChanged(
     const base::DictionaryValue& preferences) {
+  if (!initialized_) {
+    initialized_ = true;
+    NotifyInitializationCompleted();
+  }
+
   for (base::DictionaryValue::Iterator it(preferences); !it.IsAtEnd();
        it.Advance()) {
     if (keys_.find(it.key()) == keys_.end())
       continue;
-    // We deliberately call the parent to avoid notifying the server again.
     ValueMapPrefStore::SetValue(it.key(), it.value().CreateDeepCopy(), 0);
   }
-
-  if (!initialized_) {
-    initialized_ = true;
-    NotifyInitializationCompleted();
-  }
 }