Moved VariantToPathMap into util_desktop.(cc|h) so that it can be reused

in tests.

Author: Alex Ames

database/src/desktop/core/repo.cc

@@ -534,25 +534,6 @@ void Repo::PostEvents(const std::vector<Event>& events) {
   }
 }
 
-static std::map<Path, Variant> VariantToPathMap(const Variant& data) {
-  std::map<Path, Variant> path_map;
-  if (data.is_map()) {
-    for (const auto& key_value : data.map()) {
-      Variant key_string_variant;
-      const char* key;
-      if (key_value.first.is_string()) {
-        key = key_value.first.string_value();
-      } else {
-        key_string_variant = key_value.first.AsString();
-        key = key_string_variant.string_value();
-      }
-      const Variant& value = key_value.second;
-      path_map.insert(std::make_pair(Path(key), value));
-    }
-  }
-  return path_map;
-}
-
 void Repo::OnConnect() {
   SAFE_REFERENCE_RETURN_VOID_IF_INVALID(ThisRefLock, lock, safe_this_);
 

database/src/desktop/util_desktop.cc

@@ -1229,6 +1229,23 @@ std::vector<std::string> split_string(const std::string& s, const char delimiter
   return split_parts;
 }
 
+std::map<Path, Variant> VariantToPathMap(const Variant& data) {
+  std::map<Path, Variant> path_map;
+  if (data.is_map()) {
+    for (const auto& key_value : data.map()) {
+      const char* key;
+      if (key_value.first.is_string()) {
+        key = key_value.first.string_value();
+      } else {
+        key = key_value.first.AsString().string_value();
+      }
+      const Variant& value = key_value.second;
+      path_map.insert(std::make_pair(Path(key), value));
+    }
+  }
+  return path_map;
+}
+
 }  // namespace internal
 }  // namespace database
 }  // namespace firebase

database/src/desktop/util_desktop.h

@@ -357,6 +357,9 @@ std::string GetAppDataPath(const char* app_name, bool should_create = true);
 // delimiter. Returns of vector of constituent parts
 std::vector<std::string> split_string(const std::string& s,
                                       const char delimiter='/');
+
+std::map<Path, Variant> VariantToPathMap(const Variant& data);
+
 }  // namespace internal
 }  // namespace database
 }  // namespace firebase