Add PrefStore::GetValues

components/prefs/overlay_user_pref_store.cc

 // Copyright (c) 2012 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/prefs/overlay_user_pref_store.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 29 matching lines @@
                                     const base::Value** result) const {
   // If the |key| shall NOT be stored in the overlay store, there must not
   // be an entry.
   DCHECK(ShallBeStoredInOverlay(key) || !overlay_.GetValue(key, NULL));
 
   if (overlay_.GetValue(key, result))
     return true;
   return underlay_->GetValue(GetUnderlayKey(key), result);
 }
 
+std::unique_ptr<base::DictionaryValue> OverlayUserPrefStore::GetValues() const {
+  auto values = underlay_->GetValues();
+  auto overlay_values = overlay_.AsDictionaryValue();
+  for (const auto& overlay_mapping : overlay_to_underlay_names_map_) {
+    const std::string& overlay_key = overlay_mapping.first;
+    const std::string& underlay_key = overlay_mapping.first;

[Sam McNally, 2017/02/21 01:58:25]

second

[tibell, 2017/02/21 02:11:07]

Done.

+    std::unique_ptr<base::Value> out_value;
+    if (overlay_values->Remove(overlay_key, &out_value)) {
+      values->Set(overlay_key, std::move(out_value));
+    } else if (overlay_key != underlay_key) {
+      if (values->Remove(underlay_key, &out_value)) {

[Sam McNally, 2017/02/21 01:58:25]

Merge this into the else if?

[tibell, 2017/02/21 02:11:07]

Done.

Reordered things to remove some if-statement nesting.

+        values->Set(overlay_key, std::move(out_value));
+      }
+    }
+  }
+  return values;
+}
+
 bool OverlayUserPrefStore::GetMutableValue(const std::string& key,
                                            base::Value** result) {
   if (!ShallBeStoredInOverlay(key))
     return underlay_->GetMutableValue(GetUnderlayKey(key), result);
 
   if (overlay_.GetValue(key, result))
     return true;
 
   // Try to create copy of underlay if the overlay does not contain a value.
   base::Value* underlay_value = NULL;
@@ skipping 123 matching lines @@
   NamesMap::const_iterator i =
       overlay_to_underlay_names_map_.find(overlay_key);
   return i != overlay_to_underlay_names_map_.end() ? i->second : overlay_key;
 }
 
 bool OverlayUserPrefStore::ShallBeStoredInOverlay(
     const std::string& key) const {
   return overlay_to_underlay_names_map_.find(key) !=
       overlay_to_underlay_names_map_.end();
 }