Add PrefStore::GetValues

components/user_prefs/tracked/segregated_pref_store.cc

 // Copyright 2014 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 "components/user_prefs/tracked/segregated_pref_store.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 65 matching lines @@
 bool SegregatedPrefStore::IsInitializationComplete() const {
   return default_pref_store_->IsInitializationComplete() &&
          selected_pref_store_->IsInitializationComplete();
 }
 
 bool SegregatedPrefStore::GetValue(const std::string& key,
                                    const base::Value** result) const {
   return StoreForKey(key)->GetValue(key, result);
 }
 
+std::unique_ptr<base::DictionaryValue> SegregatedPrefStore::GetValues() const {
+  auto selected_values = selected_pref_store_->GetValues();

[Sam McNally, 2017/02/16 02:21:11]

These should use the selected store for keys (with expansion) in
|selected_preference_names_| and the default store for others.

[tibell, 2017/02/20 00:04:57]

Done.

+  auto default_values = default_pref_store_->GetValues();
+  auto default_iter = base::DictionaryValue::Iterator(*default_values);
+  while (!default_iter.IsAtEnd()) {
+    const std::string key = default_iter.key();
+    if (!selected_values->HasKey(key)) {
+      selected_values->SetWithoutPathExpansion(
+          key, default_iter.value().CreateDeepCopy());
+    }
+    default_iter.Advance();
+  }
+  return selected_values;
+}
+
 void SegregatedPrefStore::SetValue(const std::string& key,
                                    std::unique_ptr<base::Value> value,
                                    uint32_t flags) {
   StoreForKey(key)->SetValue(key, std::move(value), flags);
 }
 
 void SegregatedPrefStore::RemoveValue(const std::string& key, uint32_t flags) {
   StoreForKey(key)->RemoveValue(key, flags);
 }
 
@@ skipping 75 matching lines @@
       .get();
 }
 
 const PersistentPrefStore* SegregatedPrefStore::StoreForKey(
     const std::string& key) const {
   return (base::ContainsKey(selected_preference_names_, key)
               ? selected_pref_store_
               : default_pref_store_)
       .get();
 }